|
Line
Link Here
|
| 0 |
-- GG/CMakeLists.txt |
0 |
++ GG/CMakeLists.txt |
|
Lines 228-263
Link Here
|
| 228 |
######################################## |
228 |
######################################## |
| 229 |
# Header Generation # |
229 |
# Header Generation # |
| 230 |
######################################## |
230 |
######################################## |
| 231 |
if (NOT EXISTS ${CMAKE_HOME_DIRECTORY}/libltdl/config.h) |
|
|
| 232 |
if (UNIX) |
| 233 |
message("-- Configuring libltdl using \"libltdl/configure\" ...") |
| 234 |
execute_process( |
| 235 |
COMMAND ${CMAKE_HOME_DIRECTORY}/libltdl/configure |
| 236 |
WORKING_DIRECTORY ${CMAKE_HOME_DIRECTORY}/libltdl |
| 237 |
OUTPUT_QUIET |
| 238 |
) |
| 239 |
else () |
| 240 |
file(WRITE ${CMAKE_HOME_DIRECTORY}/libltdl/config.h |
| 241 |
"/* WARNING: Generated by GG's build system. All local changes will be lost! */ |
| 242 |
#define error_t int |
| 243 |
#define HAVE_STDIO_H 1 |
| 244 |
#define HAVE_STDLIB_H 1 |
| 245 |
#define HAVE_STRING_H 1 |
| 246 |
#define HAVE_CTYPE_H 1 |
| 247 |
#define HAVE_MEMORY_H 1 |
| 248 |
#define HAVE_ERRNO_H 1 |
| 249 |
#define __WIN32__ |
| 250 |
#define HAVE_MEMCPY 1 |
| 251 |
#define HAVE_MEMMOVE 1 |
| 252 |
#define LTDL_OBJDIR \".libs\" |
| 253 |
#define LTDL_DLOPEN_DEPLIBS 1 |
| 254 |
#define LTDL_SHLIBPATH_VAR \"PATH\" |
| 255 |
#define LTDL_SHLIB_EXT \".dll\" |
| 256 |
" |
| 257 |
) |
| 258 |
endif () |
| 259 |
endif () |
| 260 |
|
| 261 |
configure_file( |
231 |
configure_file( |
| 262 |
${CMAKE_HOME_DIRECTORY}/cmake/Config.h.in |
232 |
${CMAKE_HOME_DIRECTORY}/cmake/Config.h.in |
| 263 |
${CMAKE_HOME_DIRECTORY}/GG/Config.h |
233 |
${CMAKE_HOME_DIRECTORY}/GG/Config.h |
| 264 |
-- GG/src/CMakeLists.txt |
234 |
++ GG/src/CMakeLists.txt |
|
Lines 49-56
Link Here
|
| 49 |
dialogs/ColorDlg.cpp |
49 |
dialogs/ColorDlg.cpp |
| 50 |
dialogs/FileDlg.cpp |
50 |
dialogs/FileDlg.cpp |
| 51 |
dialogs/ThreeButtonDlg.cpp |
51 |
dialogs/ThreeButtonDlg.cpp |
| 52 |
|
|
|
| 53 |
../libltdl/ltdl.c |
| 54 |
|
52 |
|
| 55 |
adobe/adam.cpp |
53 |
adobe/adam.cpp |
| 56 |
adobe/adam_evaluate.cpp |
54 |
adobe/adam_evaluate.cpp |
|
Lines 162-175
Link Here
|
| 162 |
) |
160 |
) |
| 163 |
endif () |
161 |
endif () |
| 164 |
|
162 |
|
| 165 |
set_source_files_properties(${CMAKE_HOME_DIRECTORY}/libltdl/ltdl.c PROPERTIES COMPILE_DEFINITIONS HAVE_CONFIG_H=1) |
163 |
find_library(LIBTOOL_LIB ltdl) |
| 166 |
execute_process( |
164 |
if (LIBTOOL_LIB) |
| 167 |
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_HOME_DIRECTORY}/libltdl/ltdl.h ${CMAKE_HOME_DIRECTORY}/GG/ltdl.h |
165 |
MESSAGE(STATUS " libtool-libraries : ${LIBTOOL_LIB}") |
| 168 |
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_HOME_DIRECTORY}/libltdl/config.h ${CMAKE_HOME_DIRECTORY}/GG/ltdl_config.h |
166 |
else (LIBTOOL_LIB) |
| 169 |
) |
167 |
MESSAGE(FATAL_ERROR "libtool library not found!") |
| 170 |
set_source_files_properties(${CMAKE_HOME_DIRECTORY}/GG/ltdl.h ${CMAKE_HOME_DIRECTORY}/GG/ltdl_config.h PROPERTIES GENERATED true) |
168 |
endif (LIBTOOL_LIB) |
| 171 |
|
169 |
|
| 172 |
set(THIS_LIB_LINK_LIBS ${Boost_LIBRARIES} ${OPENGL_LIBRARIES} ${FREETYPE_LIBRARIES}) |
170 |
find_file(LIBTOOL_HEADER ltdl.h PATHS ${CMAKE_INCLUDE_PATH}) |
|
|
171 |
if (LIBTOOL_HEADER) |
| 172 |
MESSAGE(STATUS " libtool-header : ${LIBTOOL_HEADER}") |
| 173 |
else (LIBTOOL_HEADER) |
| 174 |
MESSAGE(FATAL_ERROR "libtool header not found!") |
| 175 |
endif (LIBTOOL_HEADER) |
| 176 |
|
| 177 |
set(THIS_LIB_LINK_LIBS ${Boost_LIBRARIES} ${OPENGL_LIBRARIES} ${FREETYPE_LIBRARIES} ${LIBTOOL_LIB}) |
| 173 |
if (USE_DEVIL) |
178 |
if (USE_DEVIL) |
| 174 |
list(APPEND THIS_LIB_LINK_LIBS ${IL_LIBRARY} ${ILUT_LIBRARY}) |
179 |
list(APPEND THIS_LIB_LINK_LIBS ${IL_LIBRARY} ${ILUT_LIBRARY}) |
| 175 |
else () |
180 |
else () |
| 176 |
-- GG/GG/PluginInterface.h |
181 |
++ GG/GG/PluginInterface.h |
|
Lines 35-41
Link Here
|
| 35 |
#if defined(__APPLE__) && defined(__MACH__) |
35 |
#if defined(__APPLE__) && defined(__MACH__) |
| 36 |
# include "../libltdl/ltdl.h" |
36 |
# include "../libltdl/ltdl.h" |
| 37 |
#else |
37 |
#else |
| 38 |
# include <GG/ltdl.h> |
38 |
# include <ltdl.h> |
| 39 |
#endif |
39 |
#endif |
| 40 |
|
40 |
|
| 41 |
#include <string> |
41 |
#include <string> |
