Additional work with cmake on Windows, still does not work
This commit is contained in:
1
thirdparty/libpng/CMakeLists.txt
vendored
1
thirdparty/libpng/CMakeLists.txt
vendored
@@ -18,6 +18,7 @@ SET(SOURCE
|
||||
pngwutil.c )
|
||||
|
||||
add_library(png ${SOURCE})
|
||||
include_directories(${ZLIB_INCLUDE_DIR})
|
||||
|
||||
if(operating_system_psp)
|
||||
# -DCHROME_PNG_WRITE_SUPPORT \
|
||||
|
||||
2
thirdparty/unzip/CMakeLists.txt
vendored
2
thirdparty/unzip/CMakeLists.txt
vendored
@@ -5,7 +5,7 @@ SET(SOURCE
|
||||
miniunz.c
|
||||
unzip.c)
|
||||
|
||||
include_directories(${ZLIB_INCLUDE_DIR} ${EXTRA_INCLUDES} ${ZLIB_INCLUDE_DIR})
|
||||
include_directories(${ZLIB_INCLUDE_DIR} ${EXTRA_INCLUDES})
|
||||
|
||||
add_library(unzip ${SOURCE})
|
||||
target_link_libraries(unzip ${ZLIB_LIBRARY})
|
||||
|
||||
4
thirdparty/zipFS/CMakeLists.txt
vendored
4
thirdparty/zipFS/CMakeLists.txt
vendored
@@ -5,8 +5,8 @@ set(SOURCES
|
||||
zstream.cpp
|
||||
ziphdr.cpp)
|
||||
|
||||
FindOrBuildZLIB()
|
||||
#FindOrBuildZLIB()
|
||||
include_directories(${CMAKE_SOURCE_DIR}/JGE/include ${EXTRA_INCLUDES} ${ZLIB_INCLUDE_DIR})
|
||||
|
||||
add_library(zipFS ${SOURCES})
|
||||
target_link_libraries(zipFS ${ZLIB_LIBRARY})
|
||||
#target_link_libraries(zipFS ${ZLIB_LIBRARY})
|
||||
Reference in New Issue
Block a user