diff --git a/Engine/lib/CMakeLists.txt b/Engine/lib/CMakeLists.txt index 165c2011a..0ea9a35c0 100644 --- a/Engine/lib/CMakeLists.txt +++ b/Engine/lib/CMakeLists.txt @@ -8,26 +8,6 @@ mark_as_advanced(ZLIB_ROOT) # Png depends on zlib add_subdirectory(zlib ${TORQUE_LIB_TARG_DIRECTORY}/zlib EXCLUDE_FROM_ALL) -#PNG -set(PNG_STATIC on CACHE BOOL "" FORCE) -mark_as_advanced(PNG_STATIC) -set(PNG_SHARED off CACHE BOOL "" FORCE) -mark_as_advanced(PNG_SHARED) -set(PNG_BUILD_ZLIB on CACHE BOOL "" FORCE) -mark_as_advanced(PNG_BUILD_ZLIB) -set(PNG_TESTS off CACHE BOOL "" FORCE) -mark_as_advanced(PNG_TESTS) -set(PNG_HARDWARE_OPTIMIZATIONS on CACHE BOOL "" FORCE) -mark_as_advanced(PNG_HARDWARE_OPTIMIZATIONS) -if(APPLE) - set(PNG_FRAMEWORK on CACHE BOOL "" FORCE) - addDef(PNG_DEBUG Debug) -endif() -mark_as_advanced(PNG_DEBUG) -mark_as_advanced(PNG_FRAMEWORK) -mark_as_advanced(PNG_PREFIX) -add_subdirectory(lpng ${TORQUE_LIB_TARG_DIRECTORY}/lpng EXCLUDE_FROM_ALL) - if(APPLE) enable_language(OBJC) advanced_option(AL_ALEXT_PROTOTYPES "Use Extended OpenAL options" OFF) @@ -206,6 +186,7 @@ endif() mark_as_advanced(PNG_DEBUG) mark_as_advanced(PNG_FRAMEWORK) mark_as_advanced(PNG_PREFIX) +add_subdirectory(lpng ${TORQUE_LIB_TARG_DIRECTORY}/lpng EXCLUDE_FROM_ALL) add_subdirectory(tinyxml2 ${TORQUE_LIB_TARG_DIRECTORY}/tinyxml2 EXCLUDE_FROM_ALL) add_subdirectory(opcode ${TORQUE_LIB_TARG_DIRECTORY}/opcode EXCLUDE_FROM_ALL)