Revision: 1613
http://rigsofrods.svn.sourceforge.net/rigsofrods/?rev=1613&view=rev
Author: rorthomas
Date: 2011-01-30 21:14:29 +0000 (Sun, 30 Jan 2011)
Log Message:
-----------
fixed layouts: fixed labels
added lennis updated spawners
Modified Paths:
--------------
trunk/CMakeDependenciesConfig.txt
trunk/bin/resources/layouts.zip
trunk/bin/resources/meshes.zip
trunk/tools/getLayoutsStringsForTranslation.py
Modified: trunk/CMakeDependenciesConfig.txt
===================================================================
--- trunk/CMakeDependenciesConfig.txt 2011-01-30 20:46:16 UTC (rev 1612)
+++ trunk/CMakeDependenciesConfig.txt 2011-01-30 21:14:29 UTC (rev 1613)
@@ -9,6 +9,7 @@
set(ROR_USE_CAELUM "FALSE" CACHE BOOL "use caelum sky")
set(ROR_USE_ANGELSCRIPT "FALSE" CACHE BOOL "use angel script")
set(ROR_FEAT_TIMING "FALSE" CACHE BOOL "enable beam statistics. For core
development only")
+set(ROR_USE_CURL "FALSE" CACHE BOOL "use curl, required for communication
with online services")
# disable some options for now
#set(ROR_USE_OPENCL "FALSE" CACHE BOOL "use opencl (highly experimental)")
@@ -63,9 +64,11 @@
set(BOOST_LIBRARY_DIRS "${ROR_DEPENDENCIES_DIR}/lib/boost" CACHE PATH
"The BOOST lib path to use")
# special include path for curl ...
- set(CURL_INCLUDE_DIRS "${ROR_DEPENDENCIES_DIR}/include/" CACHE PATH
"The curl include path to use")
- set(CURL_LIBRARY_DIRS "${ROR_DEPENDENCIES_DIR}/lib/curl" CACHE PATH
"The curl lib path to use")
- set(CURL_LIBRARIES "libcurl.lib" CACHE STRING "The curl lib to link
against")
+ if(ROR_USE_CURL)
+ set(CURL_INCLUDE_DIRS "${ROR_DEPENDENCIES_DIR}/include/" CACHE
PATH "The curl include path to use")
+ set(CURL_LIBRARY_DIRS "${ROR_DEPENDENCIES_DIR}/lib/curl" CACHE
PATH "The curl lib path to use")
+ set(CURL_LIBRARIES "libcurl.lib" CACHE STRING "The curl lib to
link against")
+ endif(ROR_USE_CURL)
set(PThread_INCLUDE_DIRS "${ROR_DEPENDENCIES_DIR}/include/pthread"
CACHE PATH "The pthread include path to use")
set(PThread_LIBRARY_DIRS "${ROR_DEPENDENCIES_DIR}/lib/pthread" CACHE
PATH "The pthread lib path to use")
@@ -180,12 +183,15 @@
PKG_CHECK_MODULES (Ois OIS REQUIRED)
find_package(CURL)
- if(NOT CURL_FOUND)
- message(ERROR "curl not found, please install curl")
- else(NOT CURL_FOUND)
- set(CURL_INCLUDE_DIRS ${CURL_INCLUDE_DIR})
- set(CURL_LIBRARIES ${CURL_LIBRARY})
- endif(NOT CURL_FOUND)
+ if(ROR_USE_CURL)
+ if(NOT CURL_FOUND)
+ message(ERROR "curl not found, please install curl")
+ else(NOT CURL_FOUND)
+ set(CURL_INCLUDE_DIRS ${CURL_INCLUDE_DIR})
+ set(CURL_LIBRARIES ${CURL_LIBRARY})
+ endif(NOT CURL_FOUND)
+ endif(ROR_USE_CURL)
+
# using cmake fingd modules
# Open-AL
Modified: trunk/bin/resources/layouts.zip
===================================================================
(Binary files differ)
Modified: trunk/bin/resources/meshes.zip
===================================================================
(Binary files differ)
Modified: trunk/tools/getLayoutsStringsForTranslation.py
===================================================================
--- trunk/tools/getLayoutsStringsForTranslation.py 2011-01-30 20:46:16 UTC
(rev 1612)
+++ trunk/tools/getLayoutsStringsForTranslation.py 2011-01-30 21:14:29 UTC
(rev 1613)
@@ -38,7 +38,7 @@
outputFile.close()
# ----------
-layoutsDir = "../../contents/contents/source/layouts"
+layoutsDir = "../bin/resources/layouts"
outputFileName = "gui_strings.po"
if len(sys.argv) == 1:
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Special Offer-- Download ArcSight Logger for FREE (a $49 USD value)!
Finally, a world-class log management solution at an even better price-free!
Download using promo code Free_Logger_4_Dev2Dev. Offer expires
February 28th, so secure your free ArcSight Logger TODAY!
http://p.sf.net/sfu/arcsight-sfd2d
_______________________________________________
Rigsofrods-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/rigsofrods-devel
