Compare commits
No commits in common. "main" and "1.1.0" have entirely different histories.
|
@ -17,7 +17,7 @@ steps:
|
||||||
commands:
|
commands:
|
||||||
- cmake -E make_directory ./windows-build
|
- cmake -E make_directory ./windows-build
|
||||||
- cd ./windows-build
|
- cd ./windows-build
|
||||||
- mingw64-cmake -DBUILD_SHARED_LIBS=OFF -S .. -B .
|
- mingw64-cmake -S .. -B .
|
||||||
- make
|
- make
|
||||||
|
|
||||||
- name: gitea_release
|
- name: gitea_release
|
||||||
|
|
|
@ -6,7 +6,7 @@ option(BUILD_SHARED_LIBS "Build shared library" OFF)
|
||||||
|
|
||||||
SET(LIB_MAJOR_VERSION "1")
|
SET(LIB_MAJOR_VERSION "1")
|
||||||
SET(LIB_MINOR_VERSION "1")
|
SET(LIB_MINOR_VERSION "1")
|
||||||
SET(LIB_REVISION "1")
|
SET(LIB_REVISION "0")
|
||||||
SET(LIB_VERSION "${LIB_MAJOR_VERSION}.${LIB_MINOR_VERSION}.${LIB_REVISION}")
|
SET(LIB_VERSION "${LIB_MAJOR_VERSION}.${LIB_MINOR_VERSION}.${LIB_REVISION}")
|
||||||
|
|
||||||
# Build Type
|
# Build Type
|
||||||
|
@ -56,12 +56,6 @@ if(BUILD_SHARED_LIBS)
|
||||||
set(LINKSTYLE PUBLIC)
|
set(LINKSTYLE PUBLIC)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(BUILD_SHARED_LIBS)
|
|
||||||
add_library(Cram SHARED ${SOURCE_FILES})
|
|
||||||
else()
|
|
||||||
add_library(Cram STATIC ${SOURCE_FILES})
|
|
||||||
endif()
|
|
||||||
|
|
||||||
if(BUILD_CLI)
|
if(BUILD_CLI)
|
||||||
file(GLOB CLI_SOURCES
|
file(GLOB CLI_SOURCES
|
||||||
tools/cli/lib/stb_image_write.h
|
tools/cli/lib/stb_image_write.h
|
||||||
|
@ -86,6 +80,11 @@ if(BUILD_CLI)
|
||||||
endif()
|
endif()
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
if(BUILD_SHARED_LIBS)
|
||||||
|
add_library(Cram SHARED ${SOURCE_FILES})
|
||||||
|
else()
|
||||||
|
add_library(Cram STATIC ${SOURCE_FILES})
|
||||||
|
endif()
|
||||||
|
|
||||||
# Build flags
|
# Build flags
|
||||||
if(NOT MSVC)
|
if(NOT MSVC)
|
||||||
|
|
|
@ -54,10 +54,6 @@
|
||||||
#define SEPARATOR '/'
|
#define SEPARATOR '/'
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef __APPLE__
|
|
||||||
#define SEPARATOR '/'
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef max
|
#ifndef max
|
||||||
#define max(x, y) (((x) > (y)) ? (x) : (y))
|
#define max(x, y) (((x) > (y)) ? (x) : (y))
|
||||||
#endif
|
#endif
|
||||||
|
@ -73,7 +69,7 @@ extern "C"
|
||||||
|
|
||||||
#define CRAM_MAJOR_VERSION 1
|
#define CRAM_MAJOR_VERSION 1
|
||||||
#define CRAM_MINOR_VERSION 1
|
#define CRAM_MINOR_VERSION 1
|
||||||
#define CRAM_PATCH_VERSION 1
|
#define CRAM_PATCH_VERSION 0
|
||||||
|
|
||||||
#define CRAM_COMPILED_VERSION ( \
|
#define CRAM_COMPILED_VERSION ( \
|
||||||
(CRAM_MAJOR_VERSION * 100 * 100) + \
|
(CRAM_MAJOR_VERSION * 100 * 100) + \
|
||||||
|
|
Loading…
Reference in New Issue