Skip to content
Permalink
Browse files

More fixes

  • Loading branch information...
H0zen committed May 27, 2019
1 parent 26edd0e commit b9bec8302c0d15dc6286c2752ade360456efe4a5
@@ -1,3 +1,8 @@
May 27, 2019
- fixed TomLib::Crypt build on VS
- fixed Detour/Recast CMake configuration
- assuring STATIC generation of libraries for ZLIB::ZLIB, BZIP2::BZIP2 and mpqlib

May 17,2019
- removed useless files from ACE

@@ -50,7 +50,7 @@ set(LIBMPQ_PACKAGE_NAME "libmpq")

configure_file(libmpq/config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h)

add_library(libmpq
add_library(libmpq STATIC
libmpq/common.c
libmpq/common.h
libmpq/crypt_buf.h
@@ -1,7 +1,9 @@
file(GLOB SOURCES Source/*.cpp)
file(GLOB INCLUDES Include/*.h)
project(Detour VERSION 1.0.0)

add_library(Detour STATIC ${SOURCES} ${INCLUDES})
file(GLOB DTR_SOURCES Source/*.cpp)
file(GLOB DTR_INCLUDES Include/*.h)

add_library(Detour STATIC ${DTR_SOURCES} ${DTR_INCLUDES})
add_library(RecastNavigation::Detour ALIAS Detour)

target_include_directories(Detour
@@ -1,7 +1,9 @@
file(GLOB SOURCES Source/*.cpp)
file(GLOB INCLUDES Include/*.h)
project(Recast VERSION 1.0.0)

add_library(Recast STATIC ${SOURCES} ${INCLUDES})
file(GLOB RCT_SOURCES Source/*.cpp)
file(GLOB RCT_INCLUDES Include/*.h)

add_library(Recast STATIC ${RCT_SOURCES} ${RCT_INCLUDES})
add_library(RecastNavigation::Recast ALIAS Recast)

target_include_directories(Recast
@@ -15,7 +15,7 @@

#include <signal.h>

void crypt_argchk(const char *v, const char *s, int d) LTC_NORETURN;
LTC_NORETURN void crypt_argchk(const char *v, const char *s, int d);
#define LTC_ARGCHK(x) do { if (!(x)) { crypt_argchk(#x, __FILE__, __LINE__); } }while(0)
#define LTC_ARGCHKVD(x) do { if (!(x)) { crypt_argchk(#x, __FILE__, __LINE__); } }while(0)

@@ -1,6 +1,6 @@
project (zlib VERSION 1.2.11)

add_library(zlib
add_library(zlib STATIC
adler32.c
compress.c
crc32.c

0 comments on commit b9bec83

Please sign in to comment.
You can’t perform that action at this time.