equal
deleted
inserted
replaced
9 set(QT_USE_QTMAIN TRUE) |
9 set(QT_USE_QTMAIN TRUE) |
10 |
10 |
11 find_package(Qt4 REQUIRED) |
11 find_package(Qt4 REQUIRED) |
12 include(${QT_USE_FILE}) |
12 include(${QT_USE_FILE}) |
13 |
13 |
14 find_package(QCA2 REQUIRED) |
14 #find_package(QCA2 REQUIRED) |
15 include_directories(${QCA2_INCLUDE_DIR}) |
15 #include_directories(${QCA2_INCLUDE_DIR}) |
16 |
16 |
17 # Configure for SDL |
17 # Configure for SDL |
18 find_package(SDL REQUIRED) |
18 find_package(SDL REQUIRED) |
19 find_package(SDL_mixer REQUIRED) |
19 find_package(SDL_mixer REQUIRED) |
20 |
20 |
79 itemNum.cpp |
79 itemNum.cpp |
80 input_ip.cpp |
80 input_ip.cpp |
81 igbox.cpp |
81 igbox.cpp |
82 weaponItem.cpp |
82 weaponItem.cpp |
83 statsPage.cpp |
83 statsPage.cpp |
|
84 misc.cpp |
84 ) |
85 ) |
85 |
86 |
86 if(MINGW) |
87 if(MINGW) |
87 # resource compilation for mingw |
88 # resource compilation for mingw |
88 add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/hedgewars_rc.o |
89 add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/hedgewars_rc.o |
126 itemNum.h |
127 itemNum.h |
127 input_ip.h |
128 input_ip.h |
128 igbox.h |
129 igbox.h |
129 weaponItem.h |
130 weaponItem.h |
130 statsPage.h |
131 statsPage.h |
|
132 misc.h |
131 ) |
133 ) |
132 |
134 |
133 set(hwfr_hdrs |
135 set(hwfr_hdrs |
134 binds.h |
136 binds.h |
135 ui_hwform.h |
137 ui_hwform.h |
153 ${hwfr_hdrs} |
155 ${hwfr_hdrs} |
154 ${hwfr_rez_src}) |
156 ${hwfr_rez_src}) |
155 |
157 |
156 set(HW_LINK_LIBS |
158 set(HW_LINK_LIBS |
157 ${QT_LIBRARIES} |
159 ${QT_LIBRARIES} |
158 ${QCA2_LIBRARIES} |
160 # ${QCA2_LIBRARIES} |
159 ${SDL_LIBRARY} |
161 ${SDL_LIBRARY} |
160 ${SDLMIXER_LIBRARY} |
162 ${SDLMIXER_LIBRARY} |
161 ) |
163 ) |
162 |
164 |
163 if(WIN32 AND NOT UNIX) |
165 if(WIN32 AND NOT UNIX) |