move lz4

CMakeLists.txt

@@ -5,11 +5,13 @@ include(GNUInstallDirs)
 set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_FULL_LIBDIR}")
 set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
 
-include_directories(external/stb)
+include_directories(external/stb external/lz4)
 
 set(MW_INSTALL_HEADERS OFF)
 add_subdirectory(external/milsko)
 
+add_subdirectory(external/lz4)
+
 add_subdirectory(engine)
 
 add_subdirectory(client)

engine/CMakeLists.txt

@@ -16,13 +16,13 @@ macro(install_target name)
 	)
 endmacro()
 
-file(GLOB GearSrc_SRC src/*.c lz4/*.c)
+file(GLOB GearSrc_SRC src/*.c)
 
 add_library(GearSrc SHARED ${GearSrc_SRC})
 target_include_directories(GearSrc PUBLIC include)
 target_include_directories(GearSrc PRIVATE lz4)
 target_compile_definitions(GearSrc PRIVATE _GEARSRC)
-target_link_libraries(GearSrc PRIVATE ode)
+target_link_libraries(GearSrc PRIVATE ode lz4)
 target_link_options(GearSrc PRIVATE -static-libgcc -static-libstdc++)
 if(NOT ${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
 	target_link_libraries(GearSrc PRIVATE m)

engine/tools/CMakeLists.txt

@@ -14,5 +14,4 @@ file(GLOB lz4_SRC ../lz4/*.c)
 compile_tool(gs_dumpfont)
 compile_tool(gs_makepak)
 
-target_include_directories(gs_makepak PRIVATE ../lz4)
-target_sources(gs_makepak PRIVATE ${lz4_SRC})
+target_link_libraries(gs_makepak PRIVATE lz4)

external/lz4/CMakeLists.txt

@@ -0,0 +1,9 @@
+cmake_minimum_required(VERSION 3.11)
+project(lz4)
+
+file(GLOB LZ4_SRC *.c)
+
+add_library(lz4 ${LZ4_SRC})
+target_include_directories(lz4 PUBLIC .)
+
+set_property(TARGET lz4 PROPERTY POSITION_INDEPENDENT_CODE ON)