mail[Wesnoth-commits] r44061 - /trunk/src/CMakeLists.txt


Others Months | Index by Date | Thread Index
>>   [Date Prev] [Date Next] [Thread Prev] [Thread Next]

Header


Content

Posted by billybiset on July 10, 2010 - 01:31:
Author: billynux
Date: Sat Jul 10 01:31:52 2010
New Revision: 44061

URL: http://svn.gna.org/viewcvs/wesnoth?rev=44061&view=rev
Log:
Reverts the default to use ana to OFF in CMake and, if selected, builds the 
server with it.

Modified:
    trunk/src/CMakeLists.txt

Modified: trunk/src/CMakeLists.txt
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/src/CMakeLists.txt?rev=44061&r1=44060&r2=44061&view=diff
==============================================================================
--- trunk/src/CMakeLists.txt (original)
+++ trunk/src/CMakeLists.txt Sat Jul 10 01:31:52 2010
@@ -38,7 +38,7 @@
   include_directories( ${ZLIB_INCLUDE_DIR} )
 endif()
 
-option ( USE_ANA_NETWORK "Compile network module using ana" ON )
+option ( USE_ANA_NETWORK "Compile network module using ana" OFF )
 
 set( network_implementation_files network.cpp network_worker.cpp )
 
@@ -72,24 +72,33 @@
        )
 endif(MSVC)
 
-set( game-external-libs
-    ${common-external-libs}
-    ${SDLIMAGE_LIBRARY}
-    ${SDLMIXER_LIBRARY}
-    ${SDLNET_LIBRARY}
-    ${SDLTTF_LIBRARY}
-    ${PANGOCAIRO_LIBRARIES}
-    ${FONTCONFIG_LIBRARIES}
-    ${LUA_LIBRARIES}
-    ${LIBDBUS_LIBRARIES}
-)
-
-if ( USE_ANA_NETWORK ) 
+if ( USE_ANA_NETWORK )
     add_subdirectory ( ana )
+
     set( game-external-libs
-        ${game-external-libs}
+        ${common-external-libs}
+        ${SDLIMAGE_LIBRARY}
+        ${SDLMIXER_LIBRARY}
+        ${SDLNET_LIBRARY}        # only to link to upload_log
         ana-static
-       )
+        ${SDLTTF_LIBRARY}
+        ${PANGOCAIRO_LIBRARIES}
+        ${FONTCONFIG_LIBRARIES}
+        ${LUA_LIBRARIES}
+        ${LIBDBUS_LIBRARIES}
+    )
+else ( USE_ANA_NETWORK )
+    set( game-external-libs
+        ${common-external-libs}
+        ${SDLIMAGE_LIBRARY}
+        ${SDLMIXER_LIBRARY}
+        ${SDLNET_LIBRARY}
+        ${SDLTTF_LIBRARY}
+        ${PANGOCAIRO_LIBRARIES}
+        ${FONTCONFIG_LIBRARIES}
+        ${LUA_LIBRARIES}
+        ${LIBDBUS_LIBRARIES}
+    )
 endif ( USE_ANA_NETWORK )
 
 if(MSVC)
@@ -107,11 +116,17 @@
     )
 endif(MSVC)
 
-
-set( server-external-libs
-    ${common-external-libs}
-    ${SDLNET_LIBRARY}
-)
+if ( USE_ANA_NETWORK )
+    set( server-external-libs
+        ${common-external-libs}
+        ana-static
+    )
+else ( USE_ANA_NETWORK )
+    set( server-external-libs
+        ${common-external-libs}
+        ${SDLNET_LIBRARY}
+    )
+endif ( USE_ANA_NETWORK )
 
 set( tools-external-libs
     ${common-external-libs}
@@ -638,8 +653,7 @@
     server/user_handler.cpp
     server/forum_user_handler.cpp
     server/sample_user_handler.cpp
-    network.cpp
-    network_worker.cpp
+    ${network_implementation_files}
     loadscreen_empty.cpp 
 )
 
@@ -662,8 +676,7 @@
     addon/validation.cpp
     campaign_server/campaign_server.cpp
     server/input_stream.cpp
-    network.cpp
-    network_worker.cpp
+    ${network_implementation_files}
     loadscreen_empty.cpp
 )
 




Related Messages


Powered by MHonArc, Updated Sat Jul 10 02:00:08 2010