simtactics/mysimulation
1
0
Fork 0
mirror of https://github.com/simtactics/mysimulation.git synced 2025-07-15 02:26:44 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

temp hack to get jpeg turbo going

Browse source
This commit is contained in:
Jip 2024-05-03 02:40:50 +02:00
parent b99359078e
commit 7189dfbd9c
4 changed files with 14 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

9
library/formats/CMakeLists.txt
View file

@ -29,10 +29,13 @@ if(WIN32)
endif()
#include_directories(${FILEHANDLER_INCLUDE} ${LIBMPG123_INCLUDE} ${LIBJPEGTURBO_INCLUDE} ${LIBPNG_INCLUDE})
include_directories(${FILEHANDLER_INCLUDE} ${LIBPNG_INCLUDE})
include_directories(${FILEHANDLER_INCLUDE} ${LIBJPEGTURBO_INCLUDE} ${LIBPNG_INCLUDE})
#TODO-JIP: hack, include vars are not set properly
include_directories( "../_deps/libjpeg-turbo" )
set(FILEHANDLER_LIB)
if(BUILD_SHARED_LIBS)
# BUILD_SHARED_LIBS
add_library(FileHandler_shared SHARED ${FILEHANDLER_SOURCES})
if(WIN32)
set_target_properties(FileHandler_shared PROPERTIES OUTPUT_NAME "FileHandler${FILEHANDLER_SERIES}")
@ -57,6 +60,4 @@ else()
target_link_libraries(FileHandler_static far_static iff_static ${LIBJPEG_LINK} ${LIBMPG123_LINK} ${LIBPNG_LINK} ${ZLIB_LINK})
set(FILEHANDLER_LIB FileHandler_static)
endif() # BUILD_SHARED_LIBS
target_link_libraries(${FILEHANDLER_LIB} far_static iff_static ${LIBJPEG_LINK} ${LIBMPG123_LINK} ${LIBPNG_LINK} ${ZLIB_LINK})
endif()