equal
deleted
inserted
replaced
13 |
13 |
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 |
19 # Bleh, let's do it for "APPLE" too. |
20 # Bleh, let's do it for "APPLE" too. |
20 IF(APPLE AND NOT MACOSX) |
21 IF(APPLE AND NOT MACOSX) |
21 SET(MACOSX TRUE) |
22 SET(MACOSX TRUE) |
22 ENDIF(APPLE AND NOT MACOSX) |
23 ENDIF(APPLE AND NOT MACOSX) |
46 SET(OTHER_LDFLAGS ${OTHER_LDFLAGS} " -mmacosx-version-min=10.2") |
47 SET(OTHER_LDFLAGS ${OTHER_LDFLAGS} " -mmacosx-version-min=10.2") |
47 ENDIF(CMAKE_OSX_ARCHITECTURES MATCHES ppc) |
48 ENDIF(CMAKE_OSX_ARCHITECTURES MATCHES ppc) |
48 |
49 |
49 # Need these everywhere... |
50 # Need these everywhere... |
50 ADD_DEFINITIONS(-fno-common) |
51 ADD_DEFINITIONS(-fno-common) |
51 SET(OTHER_LDFLAGS ${OTHER_LDFLAGS} "-framework Carbon -framework IOKit") |
52 SET(OTHER_LDFLAGS ${OTHER_LDFLAGS} "-framework IOKit") |
52 ENDIF(MACOSX) |
53 ENDIF(MACOSX) |
53 |
54 |
54 # Add some gcc-specific command lines. |
55 # Add some gcc-specific command lines. |
55 IF(CMAKE_COMPILER_IS_GNUCC) |
56 IF(CMAKE_COMPILER_IS_GNUCC) |
56 # Always build with debug symbols...you can strip it later. |
57 # Always build with debug symbols...you can strip it later. |
283 SET_TARGET_PROPERTIES(physfs PROPERTIES VERSION ${PHYSFS_VERSION}) |
284 SET_TARGET_PROPERTIES(physfs PROPERTIES VERSION ${PHYSFS_VERSION}) |
284 SET_TARGET_PROPERTIES(physfs PROPERTIES SOVERSION ${PHYSFS_SOVERSION}) |
285 SET_TARGET_PROPERTIES(physfs PROPERTIES SOVERSION ${PHYSFS_SOVERSION}) |
285 TARGET_LINK_LIBRARIES(physfs ${OPTIONAL_LIBRARY_LIBS} ${OTHER_LDFLAGS}) |
286 TARGET_LINK_LIBRARIES(physfs ${OPTIONAL_LIBRARY_LIBS} ${OTHER_LDFLAGS}) |
286 SET(PHYSFS_LIB_TARGET physfs) |
287 SET(PHYSFS_LIB_TARGET physfs) |
287 SET(PHYSFS_INSTALL_TARGETS ${PHYSFS_INSTALL_TARGETS} ";physfs") |
288 SET(PHYSFS_INSTALL_TARGETS ${PHYSFS_INSTALL_TARGETS} ";physfs") |
|
289 INSTALL(TARGETS ${PHYSFS_INSTALL_TARGETS} |
|
290 RUNTIME DESTINATION ${target_library_install_dir}) |
288 ENDIF(PHYSFS_BUILD_SHARED) |
291 ENDIF(PHYSFS_BUILD_SHARED) |
289 |
292 |
290 IF(NOT PHYSFS_BUILD_SHARED AND NOT PHYSFS_BUILD_STATIC) |
293 IF(NOT PHYSFS_BUILD_SHARED AND NOT PHYSFS_BUILD_STATIC) |
291 MESSAGE(FATAL "Both shared and static libraries are disabled!") |
294 MESSAGE(FATAL "Both shared and static libraries are disabled!") |
292 ENDIF(NOT PHYSFS_BUILD_SHARED AND NOT PHYSFS_BUILD_STATIC) |
295 ENDIF(NOT PHYSFS_BUILD_SHARED AND NOT PHYSFS_BUILD_STATIC) |