Mahtan/wagic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Various fixes and activated cmake in travis.

Browse Source
This commit is contained in:
xawotihs
2015-10-08 23:08:09 +02:00
parent 075d950249
commit 797077c47b
5 changed files with 30 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
CMakeModules/FindOrBuild.cmake
View File

@@ -90,10 +90,10 @@ endmacro()
macro(FindOrBuildZLIB)
if(BUILD_ZLIB)
add_subdirectory(${CMAKE_SOURCE_DIR}/thirdparty/zlib)
add_subdirectory(${CMAKE_SOURCE_DIR}/thirdparty/zlib)
set(ZLIB_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/thirdparty/zlib ${CMAKE_BINARY_DIR}/thirdparty/zlib)
set(ZLIB_LIBRARIES zlib)
else()
else()
if(WIN32)
set(ZLIB_ROOT ${CMAKE_SOURCE_DIR}/thirdparty/binary/win)
find_package(ZLIB)
@@ -162,12 +162,9 @@ endmacro()
macro(FindOrBuildFreetype)
if(PSP)
set(ENV{FREETYPE_DIR} ${CMAKE_SOURCE_DIR}/thirdparty/binary/psp)
elseif(WIN32)
set(ENV{FREETYPE_DIR} ${CMAKE_SOURCE_DIR}/thirdparty/binary/win)
set(ENV{FREETYPE_INCLUDE_DIRS} ${CMAKE_SOURCE_DIR}/thirdparty/binary/psp/include)
set(ENV{FREETYPE_LIBRARIES} freetype)
endif()
find_package(Freetype)
endmacro()
macro(FindOrBuildHgeTools)