Author: ivanovic
Date: Fri May 2 12:15:44 2008
New Revision: 26306
URL: http://svn.gna.org/viewcvs/wesnoth?rev=26306&view=rev
Log:
linking works...
still missing:
all the neat little options, installtion, ...
Modified:
trunk/CMakeLists.txt
trunk/src/CMakeLists.txt
Modified: trunk/CMakeLists.txt
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/CMakeLists.txt?rev=26306&r1=26305&r2=26306&view=diff
==============================================================================
--- trunk/CMakeLists.txt (original)
+++ trunk/CMakeLists.txt Fri May 2 12:15:44 2008
@@ -11,6 +11,7 @@
FIND_PACKAGE( PythonLibs 2.4 REQUIRED )
FIND_PACKAGE( Boost 1.33 REQUIRED COMPONENTS boost_iostream boost_regex )
FIND_PACKAGE( ZLIB REQUIRED )
+FIND_PACKAGE( PNG REQUIRED )
#configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake
${CMAKE_CURRENT_BINARY_DIR}/config.h)
Modified: trunk/src/CMakeLists.txt
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/CMakeLists.txt?rev=26306&r1=26305&r2=26306&view=diff
==============================================================================
--- trunk/src/CMakeLists.txt (original)
+++ trunk/src/CMakeLists.txt Fri May 2 12:15:44 2008
@@ -9,6 +9,17 @@
INCLUDE_DIRECTORIES( ${ZLIB_INCLUDE_DIR} )
# needed to get include paths in the subfolders correct
INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR}/src/ )
+
+SET( the-external-libs
+ -lSDL_image
+ -lSDL_mixer
+ -lSDL_net
+ -lSDL_ttf
+ -lSDL -lpthread
+ -lpython2.5
+ -lboost_iostreams-mt
+ -lboost_regex-mt
+)
########### libwesnoth-core ###############
@@ -188,7 +199,7 @@
)
ADD_EXECUTABLE(wesnoth ${wesnoth_SRC})
-TARGET_LINK_LIBRARIES(wesnoth wesnoth-core wesnoth-game)
+TARGET_LINK_LIBRARIES(wesnoth wesnoth-core wesnoth-game ${the-external-libs})
########### Editor ###############
@@ -207,7 +218,7 @@
)
ADD_EXECUTABLE(wesnoth_editor ${wesnoth_editor_SRC})
-TARGET_LINK_LIBRARIES(wesnoth_editor wesnoth-core)
+TARGET_LINK_LIBRARIES(wesnoth_editor wesnoth-core wesnoth-game
${the-external-libs})
########### Wesnothd Server ###############
@@ -225,7 +236,7 @@
)
ADD_EXECUTABLE(wesnothd ${wesnothd_SRC})
-TARGET_LINK_LIBRARIES(wesnothd wesnoth-core)
+TARGET_LINK_LIBRARIES(wesnothd wesnoth-core ${the-external-libs})
########### Campaign Server ###############
@@ -238,7 +249,7 @@
)
ADD_EXECUTABLE(campaignd ${campaignd_SRC})
-TARGET_LINK_LIBRARIES(campaignd wesnoth-core)
+TARGET_LINK_LIBRARIES(campaignd wesnoth-core ${the-external-libs})
########### Castle building helpers ###############
@@ -253,7 +264,7 @@
)
ADD_EXECUTABLE(exploder ${exploder_SRC})
-TARGET_LINK_LIBRARIES(exploder wesnoth-core)
+TARGET_LINK_LIBRARIES(exploder wesnoth-core ${the-external-libs} -lpng12)
SET(cutter_SRC
tools/cutter.cpp
@@ -265,7 +276,7 @@
)
ADD_EXECUTABLE(cutter ${cutter_SRC})
-TARGET_LINK_LIBRARIES(cutter wesnoth-core)
+TARGET_LINK_LIBRARIES(cutter wesnoth-core ${the-external-libs} -lpng12)
########### Unit tests ###############
@@ -276,7 +287,7 @@
)
ADD_EXECUTABLE(test ${wesnoth_SRC})
-TARGET_LINK_LIBRARIES(test wesnoth-core wesnoth-game)
+TARGET_LINK_LIBRARIES(test wesnoth-core wesnoth-game ${the-external-libs})
########### install files ###############
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
