/[gentoo-x86]/dev-games/gigi/files/gigi-0.8_pre20120910-libtool.patch
Gentoo

Contents of /dev-games/gigi/files/gigi-0.8_pre20120910-libtool.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1.2 - (show annotations) (download)
Sun Nov 10 14:14:48 2013 UTC (12 months, 2 weeks ago) by tomka
Branch: MAIN
CVS Tags: HEAD
Changes since 1.1: +0 -0 lines
FILE REMOVED
remove gigi library

1 diff -U 3 -dHrN gigi-0.8_pre20120910.orig/CMakeLists.txt gigi-0.8_pre20120910/CMakeLists.txt
2 --- gigi-0.8_pre20120910.orig/CMakeLists.txt 2012-09-10 18:48:32.272877323 -0700
3 +++ gigi-0.8_pre20120910/CMakeLists.txt 2012-09-10 18:48:49.759553898 -0700
4 @@ -228,36 +228,6 @@
5 ########################################
6 # Header Generation #
7 ########################################
8 -if (NOT EXISTS ${CMAKE_HOME_DIRECTORY}/libltdl/config.h)
9 - if (UNIX)
10 - message("-- Configuring libltdl using \"libltdl/configure\" ...")
11 - execute_process(
12 - COMMAND ${CMAKE_HOME_DIRECTORY}/libltdl/configure
13 - WORKING_DIRECTORY ${CMAKE_HOME_DIRECTORY}/libltdl
14 - OUTPUT_QUIET
15 - )
16 - else ()
17 - file(WRITE ${CMAKE_HOME_DIRECTORY}/libltdl/config.h
18 - "/* WARNING: Generated by GG's build system. All local changes will be lost! */
19 -#define error_t int
20 -#define HAVE_STDIO_H 1
21 -#define HAVE_STDLIB_H 1
22 -#define HAVE_STRING_H 1
23 -#define HAVE_CTYPE_H 1
24 -#define HAVE_MEMORY_H 1
25 -#define HAVE_ERRNO_H 1
26 -#define __WIN32__
27 -#define HAVE_MEMCPY 1
28 -#define HAVE_MEMMOVE 1
29 -#define LTDL_OBJDIR \".libs\"
30 -#define LTDL_DLOPEN_DEPLIBS 1
31 -#define LTDL_SHLIBPATH_VAR \"PATH\"
32 -#define LTDL_SHLIB_EXT \".dll\"
33 -"
34 - )
35 - endif ()
36 -endif ()
37 -
38 configure_file(
39 ${CMAKE_HOME_DIRECTORY}/cmake/Config.h.in
40 ${CMAKE_HOME_DIRECTORY}/GG/Config.h
41 diff -U 3 -dHrN gigi-0.8_pre20120910.orig/GG/PluginInterface.h gigi-0.8_pre20120910/GG/PluginInterface.h
42 --- gigi-0.8_pre20120910.orig/GG/PluginInterface.h 2012-09-10 18:48:32.301876786 -0700
43 +++ gigi-0.8_pre20120910/GG/PluginInterface.h 2012-09-10 18:49:02.264322634 -0700
44 @@ -35,7 +35,7 @@
45 #if defined(__APPLE__) && defined(__MACH__)
46 # include "../libltdl/ltdl.h"
47 #else
48 -# include <GG/ltdl.h>
49 +# include <ltdl.h>
50 #endif
51
52 #include <string>
53 diff -U 3 -dHrN gigi-0.8_pre20120910.orig/src/CMakeLists.txt gigi-0.8_pre20120910/src/CMakeLists.txt
54 --- gigi-0.8_pre20120910.orig/src/CMakeLists.txt 2012-09-10 18:48:32.327876305 -0700
55 +++ gigi-0.8_pre20120910/src/CMakeLists.txt 2012-09-10 18:48:49.759553898 -0700
56 @@ -50,8 +50,6 @@
57 dialogs/FileDlg.cpp
58 dialogs/ThreeButtonDlg.cpp
59
60 - ../libltdl/ltdl.c
61 -
62 adobe/adam.cpp
63 adobe/adam_evaluate.cpp
64 adobe/adam_parser.cpp
65 @@ -162,14 +160,21 @@
66 )
67 endif ()
68
69 -set_source_files_properties(${CMAKE_HOME_DIRECTORY}/libltdl/ltdl.c PROPERTIES COMPILE_DEFINITIONS HAVE_CONFIG_H=1)
70 -execute_process(
71 - COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_HOME_DIRECTORY}/libltdl/ltdl.h ${CMAKE_HOME_DIRECTORY}/GG/ltdl.h
72 - COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_HOME_DIRECTORY}/libltdl/config.h ${CMAKE_HOME_DIRECTORY}/GG/ltdl_config.h
73 -)
74 -set_source_files_properties(${CMAKE_HOME_DIRECTORY}/GG/ltdl.h ${CMAKE_HOME_DIRECTORY}/GG/ltdl_config.h PROPERTIES GENERATED true)
75 +find_library(LIBTOOL_LIB ltdl)
76 +if (LIBTOOL_LIB)
77 + MESSAGE(STATUS " libtool-libraries : ${LIBTOOL_LIB}")
78 +else (LIBTOOL_LIB)
79 + MESSAGE(FATAL_ERROR "libtool library not found!")
80 +endif (LIBTOOL_LIB)
81
82 -set(THIS_LIB_LINK_LIBS ${Boost_LIBRARIES} ${OPENGL_LIBRARIES} ${FREETYPE_LIBRARIES})
83 +find_file(LIBTOOL_HEADER ltdl.h PATHS ${CMAKE_INCLUDE_PATH})
84 +if (LIBTOOL_HEADER)
85 + MESSAGE(STATUS " libtool-header : ${LIBTOOL_HEADER}")
86 +else (LIBTOOL_HEADER)
87 + MESSAGE(FATAL_ERROR "libtool header not found!")
88 +endif (LIBTOOL_HEADER)
89 +
90 +set(THIS_LIB_LINK_LIBS ${Boost_LIBRARIES} ${OPENGL_LIBRARIES} ${FREETYPE_LIBRARIES} ${LIBTOOL_LIB})
91 if (USE_DEVIL)
92 list(APPEND THIS_LIB_LINK_LIBS ${IL_LIBRARY} ${ILUT_LIBRARY})
93 else ()

  ViewVC Help
Powered by ViewVC 1.1.20