blob: f0f585dd580b90901262c196b33e6f4f7b6c5abb (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
|
Index: lightspark-0.4.3/CMakeLists.txt
===================================================================
--- lightspark-0.4.3.orig/CMakeLists.txt
+++ lightspark-0.4.3/CMakeLists.txt
@@ -199,7 +199,7 @@ ENDIF(${i386})
# liblightspark.so target
ADD_LIBRARY(spark SHARED ${LIBSPARK_SOURCES})
SET_TARGET_PROPERTIES(spark PROPERTIES OUTPUT_NAME lightspark)
-TARGET_LINK_LIBRARIES(spark ${SOUND_LIBS_LIBRARIES} ${EXTRA_LIBS_LIBRARIES} ${ZLIB_LIBRARIES} ${LLVM_LIBS_CORE} ${LLVM_LIBS_JIT} ${SDL_LIBRARY} ${OPTIONAL_LIBRARIES} ${GTK_LIBRARIES} ${lib_glew})
+TARGET_LINK_LIBRARIES(spark ${CMAKE_MODULE_LINKER_FLAGS} ${SOUND_LIBS_LIBRARIES} ${EXTRA_LIBS_LIBRARIES} ${ZLIB_LIBRARIES} ${LLVM_LIBS_CORE} ${LLVM_LIBS_JIT} ${SDL_LIBRARY} ${OPTIONAL_LIBRARIES} ${GTK_LIBRARIES} ${lib_glew})
SET_TARGET_PROPERTIES(spark PROPERTIES LINK_FLAGS "${LLVM_LDFLAGS} -Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/lightspark.expmap")
SET_TARGET_PROPERTIES(spark PROPERTIES LINK_INTERFACE_LIBRARIES "")
@@ -214,7 +214,7 @@ ENDIF(UNIX)
IF(COMPILE_LIGHTSPARK)
ADD_EXECUTABLE(lightspark main.cpp)
TARGET_LINK_LIBRARIES(lightspark spark)
- TARGET_LINK_LIBRARIES(lightspark ${SDL_LIBRARY})
+ TARGET_LINK_LIBRARIES(lightspark ${SDL_LIBRARY} ${CMAKE_MODULE_LINKER_FLAGS})
IF(UNIX)
INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/lightspark.frag DESTINATION ${DATADIR}/lightspark)
@@ -227,7 +227,7 @@ ENDIF(COMPILE_LIGHTSPARK)
# tightspark executable target
IF(COMPILE_TIGHTSPARK)
ADD_EXECUTABLE(tightspark tightspark.cpp)
- TARGET_LINK_LIBRARIES(tightspark spark)
+ TARGET_LINK_LIBRARIES(tightspark spark ${CMAKE_MODULE_LINKER_FLAGS})
IF(UNIX)
INSTALL(TARGETS tightspark RUNTIME DESTINATION ${BINDIR})
Index: lightspark-0.4.3/plugin-dir/CMakeLists.txt
===================================================================
--- lightspark-0.4.3.orig/plugin-dir/CMakeLists.txt
+++ lightspark-0.4.3/plugin-dir/CMakeLists.txt
@@ -31,7 +31,7 @@ ENDIF(UNIX)
# Firefox plugin target
ADD_LIBRARY(lightsparkplugin SHARED np_entry.cpp npn_gate.cpp npp_gate.cpp plugin.cpp)
-TARGET_LINK_LIBRARIES(lightsparkplugin spark ${MOZ_PLUGIN_LIBRARIES} ${GTK_LIBRARIES})
+TARGET_LINK_LIBRARIES(lightsparkplugin spark ${CMAKE_MODULE_LINKER_FLAGS} ${MOZ_PLUGIN_LIBRARIES} ${GTK_LIBRARIES})
IF(UNIX)
INSTALL(TARGETS lightsparkplugin LIBRARY DESTINATION ${PLUGIN_DIRECTORY})
|
GitWeb
