mirror of
https://github.com/simtactics/mysimulation.git
synced 2025-07-17 19:46:43 -04:00
temp hack to get jpeg turbo going
This commit is contained in:
parent
b99359078e
commit
7189dfbd9c
4 changed files with 14 additions and 18 deletions
|
@ -11,7 +11,7 @@ if(BUILD_SHARED_LIBS)
|
|||
endif()
|
||||
|
||||
if(WIN32)
|
||||
set(64BIT 0)
|
||||
set(64BIT 1)
|
||||
else()
|
||||
set(64BIT 1)
|
||||
endif()
|
||||
|
@ -104,21 +104,21 @@ if(WIN32)
|
|||
set(ZLIB_INCLUDE ${CMAKE_SOURCE_DIR}/_deps/zlib)
|
||||
|
||||
add_subdirectory(_deps/freetype)
|
||||
#add_subdirectory(_deps/libjpeg-turbo)
|
||||
add_subdirectory(_deps/libjpeg-turbo)
|
||||
#add_subdirectory(_deps/libmpg123)
|
||||
add_subdirectory(_deps/libpng)
|
||||
#add_subdirectory(_deps/libpq)
|
||||
add_subdirectory(_deps/zlib)
|
||||
|
||||
set(FREETYPE_LINK freetype_shared)
|
||||
#set(LIBJPEG_LINK jpegturbo_static)
|
||||
set(LIBJPEG_LINK jpegturbo_static)
|
||||
#set(LIBMPG123_LINK libmpg123_static)
|
||||
set(LIBPNG_LINK libpng_static)
|
||||
#set(LIBPQ_LINK libpq_shared)
|
||||
set(ZLIB_LINK zlib_static)
|
||||
else()
|
||||
set(FREETYPE_LINK freetype)
|
||||
#set(LIBJPEG_LINK jpeg)
|
||||
set(LIBJPEG_LINK jpeg)
|
||||
#set(LIBMPG123_LINK mpg123)
|
||||
set(LIBPNG_LINK png)
|
||||
#set(LIBPQ_LINK pq)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue