etlegacy/etlegacy-libs
0
0
Fork 0
mirror of https://github.com/etlegacy/etlegacy-libs.git synced 2024-11-10 06:42:14 +00:00
Code Issues Projects Releases Packages Wiki Activity

fixed building jpegturbo on osx 64

Browse source
This commit is contained in:
Jacker 2014-12-21 16:24:25 +02:00
parent f1173cf446
commit 22b0430736
1 changed files with 14 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
CMakeLists.txt
View file

@ -382,25 +382,24 @@ elseif(UNIX)
if(BUNDLED_JPEG) if(BUNDLED_JPEG)
if(CROSS_COMPILE32) if(CROSS_COMPILE32)
if(APPLE) if(APPLE)
add_custom_command(OUTPUT ${CMAKE_CURRENT_LIST_DIR}/jpegturbo/.libs/libturbojpeg.a SET(JPEG_TURBO_BUILD ${CROSS_COMPILE32_FLAGS} ./configure --with-jpeg8 --build i686-apple-darwin && make)
COMMAND make clean || true
COMMAND ${CROSS_COMPILE32_FLAGS} ./configure --with-jpeg8 --build i686-apple-darwin && make
WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/jpegturbo
)
else() else()
add_custom_command(OUTPUT ${CMAKE_CURRENT_LIST_DIR}/jpegturbo/.libs/libturbojpeg.a SET(JPEG_TURBO_BUILD ${CROSS_COMPILE32_FLAGS} ./configure --with-jpeg8 --build i686-pc-linux-gnu && make)
COMMAND make clean || true
COMMAND ${CROSS_COMPILE32_FLAGS} ./configure --with-jpeg8 --build i686-pc-linux-gnu && make
WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/jpegturbo
)
endif() endif()
else(CROSS_COMPILE32) else(CROSS_COMPILE32)
if(APPLE)
SET(JPEG_TURBO_BUILD ${CROSS_COMPILE32_FLAGS} ./configure --with-jpeg8 --build x86_64-apple-darwin && make)
else()
SET(JPEG_TURBO_BUILD ${CROSS_COMPILE32_FLAGS} ./configure --with-jpeg8 && make)
endif()
endif()
add_custom_command(OUTPUT ${CMAKE_CURRENT_LIST_DIR}/jpegturbo/.libs/libturbojpeg.a add_custom_command(OUTPUT ${CMAKE_CURRENT_LIST_DIR}/jpegturbo/.libs/libturbojpeg.a
COMMAND make clean || true COMMAND make clean || true
COMMAND ${CROSS_COMPILE32_FLAGS} ./configure --with-jpeg8 && make COMMAND ${JPEG_TURBO_BUILD}
WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/jpegturbo WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/jpegturbo
) )
endif()
add_custom_target(bundled_jpeg add_custom_target(bundled_jpeg
DEPENDS ${CMAKE_CURRENT_LIST_DIR}/jpegturbo/.libs/libturbojpeg.a DEPENDS ${CMAKE_CURRENT_LIST_DIR}/jpegturbo/.libs/libturbojpeg.a
) )