Revision: 1423
http://rigsofrods.svn.sourceforge.net/rigsofrods/?rev=1423&view=rev
Author: rorthomas
Date: 2010-06-29 19:23:46 +0000 (Tue, 29 Jun 2010)
Log Message:
-----------
removed hack from installer cmake script, not required anymore.
added new litesql dependency (not used yet)
Modified Paths:
--------------
trunk/CMakeDependenciesConfig.txt
trunk/source/installer/CMakeLists.txt
Modified: trunk/CMakeDependenciesConfig.txt
===================================================================
--- trunk/CMakeDependenciesConfig.txt 2010-06-24 01:56:27 UTC (rev 1422)
+++ trunk/CMakeDependenciesConfig.txt 2010-06-29 19:23:46 UTC (rev 1423)
@@ -7,6 +7,7 @@
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 some defaults
IF(WIN32)
@@ -56,74 +57,81 @@
if(ROR_USE_MYGUI)
set(MYGUI_INCLUDE_DIRS
"${ROR_DEPENDENCIES_DIR}/include/MyGUI" CACHE PATH "The mygui include path to
use")
set(MYGUI_LIBRARY_DIRS "${ROR_DEPENDENCIES_DIR}/lib"
CACHE PATH "The mygui lib path to use")
- set(MYGUI_LIBRARIES "MyGUI.OgrePlatform.lib
MyGUIEngine.lib" CACHE STRING "The mygui libs to link against")
+ set(MYGUI_LIBRARIES "MyGUI.OgrePlatform.lib
MyGUIEngine.lib" CACHE STRING "The mygui libs to link against")
endif(ROR_USE_MYGUI)
if(ROR_USE_OPENAL)
set(OPENAL_INCLUDE_DIRS
"${ROR_DEPENDENCIES_DIR}/include/openal-soft" CACHE PATH "The openal include
path to use")
set(OPENAL_LIBRARY_DIRS "${ROR_DEPENDENCIES_DIR}/lib"
CACHE PATH "The openal lib path to use")
- set(OPENAL_LIBRARIES "OpenAL32.lib" CACHE STRING "The
openal libs to link against")
+ set(OPENAL_LIBRARIES "OpenAL32.lib" CACHE STRING
"The openal libs to link against")
endif(ROR_USE_OPENAL)
if(ROR_USE_LUA)
set(LUA_INCLUDE_DIRS
"${ROR_DEPENDENCIES_DIR}/include/lua" CACHE PATH "The lua include path to use")
set(LUA_LIBRARY_DIRS "${ROR_DEPENDENCIES_DIR}/lib"
CACHE PATH "The lua lib path to use")
- set(LUA_LIBRARIES "lua.lib" CACHE STRING "The lua lib
to link against")
+ set(LUA_LIBRARIES "lua.lib" CACHE STRING "The lua
lib to link against")
endif(ROR_USE_LUA)
if(ROR_USE_SOCKETW)
set(SOCKETW_INCLUDE_DIRS
"${ROR_DEPENDENCIES_DIR}/include/SocketW" CACHE PATH "The socketw include path
to use")
set(SOCKETW_LIBRARY_DIRS "${ROR_DEPENDENCIES_DIR}/lib"
CACHE PATH "The socketw lib path to use")
- set(SOCKETW_LIBRARIES "mysocketw.lib Ws2_32.lib" CACHE
STRING "The socketw lib to link against")
+ set(SOCKETW_LIBRARIES "mysocketw.lib Ws2_32.lib"
CACHE STRING "The socketw lib to link against")
endif(ROR_USE_SOCKETW)
if(ROR_USE_MOFILEREADER)
set(MOFILEREADER_INCLUDE_DIRS
"${ROR_DEPENDENCIES_DIR}/include/mofilereader" CACHE PATH "The mofilereader
include path to use")
set(MOFILEREADER_LIBRARY_DIRS
"${ROR_DEPENDENCIES_DIR}/lib" CACHE PATH "The mofilereader lib path to use")
- set(MOFILEREADER_LIBRARIES "moFileReader.static.lib"
CACHE STRING "The mofilereader lib to link against")
+ set(MOFILEREADER_LIBRARIES "moFileReader.static.lib"
CACHE STRING "The mofilereader lib to link against")
endif(ROR_USE_MOFILEREADER)
if(ROR_USE_PAGED)
set(PAGED_INCLUDE_DIRS
"${ROR_DEPENDENCIES_DIR}/include/PagedGeometry" CACHE PATH "The paged include
path to use")
set(PAGED_LIBRARY_DIRS "${ROR_DEPENDENCIES_DIR}/lib"
CACHE PATH "The paged lib path to use")
- set(PAGED_LIBRARIES "PagedGeometry.lib" CACHE STRING
"The paged lib to link against")
+ set(PAGED_LIBRARIES "PagedGeometry.lib" CACHE STRING
"The paged lib to link against")
endif(ROR_USE_PAGED)
if(ROR_USE_CAELUM)
set(CAELUM_INCLUDE_DIRS
"${ROR_DEPENDENCIES_DIR}/include/Caelum" CACHE PATH "The caelum include path to
use")
set(CAELUM_LIBRARY_DIRS "${ROR_DEPENDENCIES_DIR}/lib"
CACHE PATH "The caelum lib path to use")
- set(CAELUM_LIBRARIES "caelum.lib" CACHE STRING "The
caelum lib to link against")
+ set(CAELUM_LIBRARIES "caelum.lib" CACHE STRING "The
caelum lib to link against")
endif(ROR_USE_CAELUM)
if(ROR_USE_CRASHRPT)
set(CRASHRPT_INCLUDE_DIRS
"${ROR_DEPENDENCIES_DIR}/include/CrashRpt" CACHE PATH "The CrashRpt include
path to use")
set(CRASHRPT_LIBRARY_DIRS "${ROR_DEPENDENCIES_DIR}/lib"
CACHE PATH "The CrashRpt lib path to use")
- set(CRASHRPT_LIBRARIES "CrashRpt.lib" CACHE STRING "The
CrashRpt lib to link against")
+ set(CRASHRPT_LIBRARIES "CrashRpt.lib" CACHE STRING
"The CrashRpt lib to link against")
endif(ROR_USE_CRASHRPT)
if(ROR_USE_ANGELSCRIPT)
set(ANGELSCRIPT_INCLUDE_DIRS
"${ROR_DEPENDENCIES_DIR}/include/AngelScript" CACHE PATH "The AngelScript
include path to use")
set(ANGELSCRIPT_LIBRARY_DIRS
"${ROR_DEPENDENCIES_DIR}/lib" CACHE PATH "The AngelScript lib path to use")
- set(ANGELSCRIPT_LIBRARIES "angelscript.lib" CACHE
STRING "The AngelScript lib to link against")
+ set(ANGELSCRIPT_LIBRARIES "angelscript.lib" CACHE
STRING "The AngelScript lib to link against")
endif(ROR_USE_ANGELSCRIPT)
if(ROR_USE_HYDRAX)
set(HYDRAX_INCLUDE_DIRS
"${ROR_DEPENDENCIES_DIR}/include/Hydrax;${ROR_DEPENDENCIES_DIR}/include/" CACHE
PATH "The Hydrax include paths to use")
set(HYDRAX_LIBRARY_DIRS "${ROR_DEPENDENCIES_DIR}/lib"
CACHE PATH "The Hydrax lib path to use")
- set(HYDRAX_LIBRARIES "Hydrax.lib" CACHE STRING "The
Hydrax lib to link against")
+ set(HYDRAX_LIBRARIES "Hydrax.lib" CACHE STRING "The
Hydrax lib to link against")
endif(ROR_USE_HYDRAX)
if(ROR_BUILD_CONFIGURATOR)
set(WXWIDGETS_SHARED_INCLUDE_DIRS
"${ROR_DEPENDENCIES_DIR}/include/wxWidgets" CACHE PATH "The wxWidgets (shared)
include paths to use")
set(WXWIDGETS_SHARED_LIBRARY_DIRS
"${ROR_DEPENDENCIES_DIR}/lib/wx/shared" CACHE PATH "The wxWidgets (shared) lib
path to use")
- set(WXWIDGETS_SHARED_LIBRARIES
"wxbase29u.lib;wxmsw29u_core.lib;wxmsw29u_html.lib;wxbase29u_net.lib;wxmsw29u_adv.lib;wxpng.lib;wxtiff.lib;wxjpeg.lib;wxzlib.lib;wxregexu.lib;wxexpat.lib;winmm;comctl32;rpcrt4;wsock32"
CACHE STRING "The wxWidgets(shared) libs to link against")
+ set(WXWIDGETS_SHARED_LIBRARIES
"wxbase29u.lib;wxmsw29u_core.lib;wxmsw29u_html.lib;wxbase29u_net.lib;wxmsw29u_adv.lib;wxpng.lib;wxtiff.lib;wxjpeg.lib;wxzlib.lib;wxregexu.lib;wxexpat.lib;winmm;comctl32;rpcrt4;wsock32"
CACHE STRING "The wxWidgets(shared) libs to link against")
endif(ROR_BUILD_CONFIGURATOR)
if(ROR_BUILD_INSTALLER)
set(WXWIDGETS_STATIC_INCLUDE_DIRS
"${ROR_DEPENDENCIES_DIR}/include/wxWidgets" CACHE PATH "The wxWidgets (static)
include paths to use")
set(WXWIDGETS_STATIC_LIBRARY_DIRS
"${ROR_DEPENDENCIES_DIR}/lib/wx/static" CACHE PATH "The wxWidgets (static) lib
path to use")
- set(WXWIDGETS_STATIC_LIBRARIES
"wxbase29u.lib;wxmsw29u_core.lib;wxmsw29u_html.lib;wxmsw29u_adv.lib;wxbase29u_net.lib;wxpng.lib;wxtiff.lib;wxjpeg.lib;wxzlib.lib;wxregexu.lib;wxexpat.lib;winmm;comctl32;rpcrt4;wsock32"
CACHE STRING "The wxWidgets(shared) libs to link against")
+ set(WXWIDGETS_STATIC_LIBRARIES
"wxbase29u.lib;wxmsw29u_core.lib;wxmsw29u_html.lib;wxmsw29u_adv.lib;wxbase29u_net.lib;wxpng.lib;wxtiff.lib;wxjpeg.lib;wxzlib.lib;wxregexu.lib;wxexpat.lib;winmm;comctl32;rpcrt4;wsock32"
CACHE STRING "The wxWidgets(shared) libs to link against")
endif(ROR_BUILD_INSTALLER)
+
+ if(ROR_USE_LITESQL)
+ set(LITESQL_INCLUDE_DIRS
"${ROR_DEPENDENCIES_DIR}/include/litesql" CACHE PATH "The litesql include path
to use")
+ set(LITESQL_LIBRARY_DIRS
"${ROR_DEPENDENCIES_DIR}/lib/litesql" CACHE PATH "The litesql lib path to use")
+ set(LITESQL_LIBRARIES "litesql.lib litesql-util.lib
litesql_sqlite.lib" CACHE STRING "The litesql libs to link against")
+ endif(ROR_USE_LITESQL)
+
ELSEIF(UNIX)
find_package(PkgConfig)
PKG_CHECK_MODULES (GTK gtk+-2.0 REQUIRED)
Modified: trunk/source/installer/CMakeLists.txt
===================================================================
--- trunk/source/installer/CMakeLists.txt 2010-06-24 01:56:27 UTC (rev
1422)
+++ trunk/source/installer/CMakeLists.txt 2010-06-29 19:23:46 UTC (rev
1423)
@@ -37,6 +37,8 @@
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.")
@@ -46,9 +48,6 @@
IF(WIN32)
add_definitions("-D__WIN32__ -D_CRT_SECURE_NO_WARNINGS -DPLATFORM=1
-DWIN32_LEAN_AND_MEAN")
- link_directories ("C:\\Program Files\\boost\\boost_1_39\\lib")
- link_directories ("C:\\Program Files (x86)\\boost\\boost_1_39\\lib")
- link_directories ("C:\\wxWidgets-2.9.0-static\\lib\\vc_lib")
ENDIF(WIN32)
IF(UNIX)
add_definitions("-DPLATFORM=2")
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
This SF.net email is sponsored by Sprint
What will you do first with EVO, the first 4G phone?
Visit sprint.com/first -- http://p.sf.net/sfu/sprint-com-first
_______________________________________________
Rigsofrods-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/rigsofrods-devel
