equal
deleted
inserted
replaced
29 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/ui) |
29 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/ui) |
30 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/ui/dialog) |
30 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/ui/dialog) |
31 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/ui/page) |
31 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/ui/page) |
32 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/ui/widget) |
32 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/ui/widget) |
33 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/util) |
33 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/util) |
|
34 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/util/platform) |
34 include_directories(${SDL_INCLUDE_DIR}) |
35 include_directories(${SDL_INCLUDE_DIR}) |
35 include_directories(${SDLMIXER_INCLUDE_DIR}) |
36 include_directories(${SDLMIXER_INCLUDE_DIR}) |
36 include_directories(${FFMPEG_INCLUDE_DIR}) |
37 include_directories(${FFMPEG_INCLUDE_DIR}) |
37 include_directories(${CMAKE_SOURCE_DIR}/misc/physfs/src) |
38 include_directories(${CMAKE_SOURCE_DIR}/misc/physfs/src) |
38 include_directories(${CMAKE_SOURCE_DIR}/misc/physfs/extras) |
39 include_directories(${CMAKE_SOURCE_DIR}/misc/physfs/extras) |
81 ${CMAKE_CURRENT_BINARY_DIR}/hwconsts.cpp |
82 ${CMAKE_CURRENT_BINARY_DIR}/hwconsts.cpp |
82 ) |
83 ) |
83 |
84 |
84 #xfire integration |
85 #xfire integration |
85 if(WIN32) |
86 if(WIN32) |
86 list(APPEND hwfr_src xfire.cpp ../misc/xfire/xfiregameclient.cpp) |
87 list(APPEND hwfr_src util/platform/xfire.cpp util/platform/xfiregameclient.cpp) |
87 endif(WIN32) |
88 endif(WIN32) |
88 |
89 |
89 if(MINGW) |
90 if(MINGW) |
90 # resource compilation for mingw |
91 # resource compilation for mingw |
91 add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/hedgewars_rc.o |
92 add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/hedgewars_rc.o |
142 |
143 |
143 |
144 |
144 if(APPLE) |
145 if(APPLE) |
145 find_library(iokit_framework NAMES IOKit) |
146 find_library(iokit_framework NAMES IOKit) |
146 list(APPEND HW_LINK_LIBS ${iokit_framework}) |
147 list(APPEND HW_LINK_LIBS ${iokit_framework}) |
147 list(APPEND hwfr_src CocoaInitializer.mm |
148 list(APPEND hwfr_src util/platform/CocoaInitializer.mm |
148 InstallController.cpp |
149 util/platform/InstallController.cpp |
149 M3Panel.mm |
150 util/platform/M3Panel.mm |
150 M3InstallController.m |
151 util/platform/M3InstallController.m |
151 NSWorkspace_RBAdditions.m |
152 util/platform/NSWorkspace_RBAdditions.m |
152 ) |
153 ) |
153 if(NOT NOAUTOUPDATE) |
154 if(NOT NOAUTOUPDATE) |
154 find_package(Sparkle) |
155 find_package(Sparkle) |
155 if(SPARKLE_FOUND) |
156 if(SPARKLE_FOUND) |
156 add_definitions(-DSPARKLE_ENABLED) |
157 add_definitions(-DSPARKLE_ENABLED) |
157 list(APPEND hwfr_src AutoUpdater.cpp SparkleAutoUpdater.mm) |
158 list(APPEND hwfr_src util/platform/AutoUpdater.cpp |
|
159 util/platform/SparkleAutoUpdater.mm) |
158 list(APPEND HW_LINK_LIBS ${SPARKLE_LIBRARY}) |
160 list(APPEND HW_LINK_LIBS ${SPARKLE_LIBRARY}) |
159 endif() |
161 endif() |
160 endif() |
162 endif() |
161 endif() |
163 endif() |
162 |
164 |