equal
deleted
inserted
replaced
14 # I hate that they define "WIN32" ... we're about to move to Win64...I hope! |
14 # I hate that they define "WIN32" ... we're about to move to Win64...I hope! |
15 IF(WIN32 AND NOT WINDOWS) |
15 IF(WIN32 AND NOT WINDOWS) |
16 SET(WINDOWS TRUE) |
16 SET(WINDOWS TRUE) |
17 ENDIF(WIN32 AND NOT WINDOWS) |
17 ENDIF(WIN32 AND NOT WINDOWS) |
18 |
18 |
19 if(WINDOWS) |
|
20 find_package(SDL REQUIRED) |
|
21 endif(WINDOWS) |
|
22 |
19 |
23 # Bleh, let's do it for "APPLE" too. |
20 # Bleh, let's do it for "APPLE" too. |
24 IF(APPLE AND NOT MACOSX) |
21 IF(APPLE AND NOT MACOSX) |
25 SET(MACOSX TRUE) |
22 SET(MACOSX TRUE) |
26 ENDIF(APPLE AND NOT MACOSX) |
23 ENDIF(APPLE AND NOT MACOSX) |
36 |
33 |
37 INCLUDE(CheckIncludeFile) |
34 INCLUDE(CheckIncludeFile) |
38 INCLUDE(CheckLibraryExists) |
35 INCLUDE(CheckLibraryExists) |
39 INCLUDE(CheckCSourceCompiles) |
36 INCLUDE(CheckCSourceCompiles) |
40 |
37 |
|
38 find_package(SDL REQUIRED) |
41 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src) |
39 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src) |
42 include_directories(${SDL_INCLUDE_DIR}) #hw |
40 include_directories(${SDL_INCLUDE_DIR}) #hw |
43 include_directories(${LUA_INCLUDE_DIR}) #hw |
41 include_directories(${LUA_INCLUDE_DIR}) #hw |
44 |
42 |
45 IF(MACOSX) |
43 IF(MACOSX) |
280 SET(PHYSFS_LIB_TARGET physfs) |
278 SET(PHYSFS_LIB_TARGET physfs) |
281 SET(PHYSFS_INSTALL_TARGETS ${PHYSFS_INSTALL_TARGETS} ";physfs") |
279 SET(PHYSFS_INSTALL_TARGETS ${PHYSFS_INSTALL_TARGETS} ";physfs") |
282 ENDIF(PHYSFS_BUILD_STATIC) |
280 ENDIF(PHYSFS_BUILD_STATIC) |
283 |
281 |
284 IF(PHYSFS_BUILD_SHARED) |
282 IF(PHYSFS_BUILD_SHARED) |
285 find_package(SDL REQUIRED) |
|
286 ADD_LIBRARY(physfs SHARED ${PHYSFS_SRCS}) |
283 ADD_LIBRARY(physfs SHARED ${PHYSFS_SRCS}) |
287 SET_TARGET_PROPERTIES(physfs PROPERTIES VERSION ${PHYSFS_VERSION}) |
284 SET_TARGET_PROPERTIES(physfs PROPERTIES VERSION ${PHYSFS_VERSION}) |
288 SET_TARGET_PROPERTIES(physfs PROPERTIES SOVERSION ${PHYSFS_SOVERSION}) |
285 SET_TARGET_PROPERTIES(physfs PROPERTIES SOVERSION ${PHYSFS_SOVERSION}) |
289 TARGET_LINK_LIBRARIES(physfs ${OPTIONAL_LIBRARY_LIBS} ${OTHER_LDFLAGS}) |
286 TARGET_LINK_LIBRARIES(physfs ${OPTIONAL_LIBRARY_LIBS} ${OTHER_LDFLAGS}) |
290 SET(PHYSFS_LIB_TARGET physfs) |
287 SET(PHYSFS_LIB_TARGET physfs) |