Revision: 1569
http://rigsofrods.svn.sourceforge.net/rigsofrods/?rev=1569&view=rev
Author: rorthomas
Date: 2011-01-16 00:57:20 +0000 (Sun, 16 Jan 2011)
Log Message:
-----------
commented some unused cmake flags for now
fixed installer wx finding
Modified Paths:
--------------
trunk/CMakeDependenciesConfig.txt
trunk/source/installer/CMakeLists.txt
Modified: trunk/CMakeDependenciesConfig.txt
===================================================================
--- trunk/CMakeDependenciesConfig.txt 2011-01-15 22:58:53 UTC (rev 1568)
+++ trunk/CMakeDependenciesConfig.txt 2011-01-16 00:57:20 UTC (rev 1569)
@@ -8,11 +8,15 @@
set(ROR_USE_PAGED "FALSE" CACHE BOOL "use paged geometry")
set(ROR_USE_CAELUM "FALSE" CACHE BOOL "use caelum sky")
set(ROR_USE_ANGELSCRIPT "FALSE" CACHE BOOL "use angel script")
-set(ROR_USE_LITESQL "FALSE" CACHE BOOL "use sqlite")
set(ROR_FEAT_TIMING "FALSE" CACHE BOOL "enable beam statistics. For core
development only")
-set(ROR_USE_OPENCL "FALSE" CACHE BOOL "use opencl (highly experimental)")
+# disable some options for now
+#set(ROR_USE_OPENCL "FALSE" CACHE BOOL "use opencl (highly experimental)")
+#set(ROR_USE_LITESQL "FALSE" CACHE BOOL "use sqlite")
+set(ROR_USE_OPENCL OFF)
+set(ROR_USE_LITESQL OFF)
+
# set some defaults
IF(WIN32)
# options only available under windows
Modified: trunk/source/installer/CMakeLists.txt
===================================================================
--- trunk/source/installer/CMakeLists.txt 2011-01-15 22:58:53 UTC (rev
1568)
+++ trunk/source/installer/CMakeLists.txt 2011-01-16 00:57:20 UTC (rev
1569)
@@ -36,17 +36,20 @@
endif(NOT ${LSB_ID} STREQUAL "")
ENDIF(UNIX)
-include_directories(${WXWIDGETS_STATIC_INCLUDE_DIRS})
-link_directories (${WXWIDGETS_STATIC_LIBRARY_DIRS})
-
add_definitions("-DINSTALLER_PLATFORM=\"${INSTALLER_PLATFORM}\"")
-message("the default installer platform is \"${INSTALLER_PLATFORM}\". To
change this, edit INSTALLER_PLATFORM value in cmake.")
+#message("the default installer platform is \"${INSTALLER_PLATFORM}\". To
change this, edit INSTALLER_PLATFORM value in cmake.")
include_directories(${CURL_INCLUDE_DIRS})
link_directories (${CURL_LIBRARY_DIRS})
include_directories(${BOOST_INCLUDE_DIRS})
link_directories (${BOOST_LIBRARY_DIRS})
+# find wxwidgets
+SET(wxWidgets_USE_UNICODE ON)
+FIND_PACKAGE(wxWidgets REQUIRED COMPONENTS base core html net adv)
+include_directories(${wxWidgets_INCLUDE_DIRS})
+add_definitions("-D${wxWidgets_DEFINITIONS}" ${wxWidgets_CXX_FLAGS})
+link_directories (${wxWidgets_LIB_DIR})
IF(WIN32)
add_definitions("-D__WIN32__ -D_CRT_SECURE_NO_WARNINGS -DPLATFORM=1
-DWIN32_LEAN_AND_MEAN")
@@ -58,13 +61,6 @@
INCLUDE_DIRECTORIES(${GTK_INCLUDE_DIRS})
link_directories (${wxWidgets_LIB_DIR})
- # find wxwidgets
- SET(wxWidgets_USE_UNICODE ON)
- FIND_PACKAGE(wxWidgets REQUIRED COMPONENTS base core html net adv)
- include_directories(${wxWidgets_INCLUDE_DIRS})
- add_definitions("-D${wxWidgets_DEFINITIONS}" ${wxWidgets_CXX_FLAGS})
- link_directories (${wxWidgets_LIB_DIR})
-
# and boost
FIND_PACKAGE(Boost REQUIRED system filesystem)
ENDIF(UNIX)
@@ -76,19 +72,19 @@
#add_definitions("${CMAKE_WXWINDOWS_CXX_FLAGS}")
-add_executable(installer ${source_files} ${include_files} ${resource_files})
-windows_hacks(installer)
# we dont need to add ${Boost_LIBRARIES} here, could be wrong as well ...
IF(WIN32)
- SET_TARGET_PROPERTIES(installer PROPERTIES COMPILE_FLAGS "/bigobj /MT /MP")
- SET_TARGET_PROPERTIES(installer PROPERTIES LINK_FLAGS
"/MANIFESTUAC:\"level='requireAdministrator' uiAccess='false'\"
/SUBSYSTEM:WINDOWS /NODEFAULTLIB:\"msvcprt.lib\" /NODEFAULTLIB:\"MSVCRT.lib\"")
- TARGET_LINK_LIBRARIES(installer ${WXWIDGETS_STATIC_LIBRARIES})
+ add_executable(installer WIN32 ${source_files} ${include_files}
${resource_files})
+ # no more static linking :/
+ #SET_TARGET_PROPERTIES(installer PROPERTIES COMPILE_FLAGS "/bigobj /MT /MP")
+ # TODO: fix UAC and VS2010
+ #SET_TARGET_PROPERTIES(installer PROPERTIES LINK_FLAGS
"/MANIFESTUAC:\"level='requireAdministrator' uiAccess='false'\"
/SUBSYSTEM:WINDOWS /NODEFAULTLIB:\"msvcprt.lib\" /NODEFAULTLIB:\"MSVCRT.lib\"")
ELSE(WIN32)
+ add_executable(installer ${source_files} ${include_files} ${resource_files})
TARGET_LINK_LIBRARIES(installer ${Boost_LIBRARIES})
- TARGET_LINK_LIBRARIES(installer ${wxWidgets_LIBRARIES})
ENDIF(WIN32)
-TARGET_LINK_LIBRARIES(installer ${CURL_LIBRARIES})
+TARGET_LINK_LIBRARIES(installer ${wxWidgets_LIBRARIES} ${CURL_LIBRARIES})
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Protect Your Site and Customers from Malware Attacks
Learn about various malware tactics and how to avoid them. Understand
malware threats, the impact they can have on your business, and how you
can protect your company and customers by using code signing.
http://p.sf.net/sfu/oracle-sfdevnl
_______________________________________________
Rigsofrods-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/rigsofrods-devel
