Revision: 1606
http://rigsofrods.svn.sourceforge.net/rigsofrods/?rev=1606&view=rev
Author: rorthomas
Date: 2011-01-30 14:43:48 +0000 (Sun, 30 Jan 2011)
Log Message:
-----------
moved Angelscript addons into its own library, much cleaner
Modified Paths:
--------------
trunk/CMakeDependenciesConfig.txt
trunk/source/CMakeLists.txt
trunk/source/main/CMakeLists.txt
trunk/source/main/RoR.list
trunk/source/main/ScriptEngine.cpp
Removed Paths:
-------------
trunk/source/main/angelscript/
Modified: trunk/CMakeDependenciesConfig.txt
===================================================================
--- trunk/CMakeDependenciesConfig.txt 2011-01-30 13:31:09 UTC (rev 1605)
+++ trunk/CMakeDependenciesConfig.txt 2011-01-30 14:43:48 UTC (rev 1606)
@@ -135,9 +135,9 @@
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/AngelScript" CACHE PATH "The AngelScript lib path
to use")
- set(ANGELSCRIPT_LIBRARIES "angelscript.lib" CACHE STRING
"The AngelScript lib to link against")
+ set(ANGELSCRIPT_INCLUDE_DIRS
"${ROR_DEPENDENCIES_DIR}/include/AngelScript;${RoR_SOURCE_DIR}/source/angelscript_addons"
CACHE PATH "The AngelScript include path to use")
+ set(ANGELSCRIPT_LIBRARY_DIRS
"${ROR_DEPENDENCIES_DIR}/lib/AngelScript" CACHE PATH "The AngelScript lib paths
to use")
+ set(ANGELSCRIPT_LIBRARIES "angelscript.lib" CACHE STRING
"The AngelScript libs to link against")
endif(ROR_USE_ANGELSCRIPT)
if(ROR_USE_HYDRAX)
@@ -283,6 +283,8 @@
find_path(ANGELSCRIPT_INCLUDE_DIRS "angelscript.h")
if(ROR_USE_ANGELSCRIPT)
find_library(ANGELSCRIPT_LIBRARIES "angelscript")
+ # add our addons to the include path
+ set(ANGELSCRIPT_INCLUDE_DIRS
"${ANGELSCRIPT_INCLUDE_DIRS};${RoR_SOURCE_DIR}/source/angelscript_addons")
else(ROR_USE_ANGELSCRIPT)
if(ANGELSCRIPT_INCLUDE_DIRS)
message(" > Angelscript found, you should enable Angelscript support
by setting ROR_USE_ANGELSCRIPT")
Modified: trunk/source/CMakeLists.txt
===================================================================
--- trunk/source/CMakeLists.txt 2011-01-30 13:31:09 UTC (rev 1605)
+++ trunk/source/CMakeLists.txt 2011-01-30 14:43:48 UTC (rev 1606)
@@ -1,7 +1,12 @@
add_subdirectory(main)
+if(ROR_USE_ANGELSCRIPT)
+ add_subdirectory(angelscript_addons)
+endif()
+
set(ROR_BUILD_CONFIGURATOR "TRUE" CACHE BOOL "build the configurator")
+
IF(ROR_BUILD_CONFIGURATOR)
add_subdirectory(configurator)
#add_subdirectory(modmanager)
Modified: trunk/source/main/CMakeLists.txt
===================================================================
--- trunk/source/main/CMakeLists.txt 2011-01-30 13:31:09 UTC (rev 1605)
+++ trunk/source/main/CMakeLists.txt 2011-01-30 14:43:48 UTC (rev 1606)
@@ -66,6 +66,7 @@
if(ROR_USE_ANGELSCRIPT)
add_definitions("-DAS_USE_NAMESPACE")
+ set(optional_libs ${optional_libs} angelscript_addons)
endif()
if(ROR_USE_OIS_G27)
Modified: trunk/source/main/RoR.list
===================================================================
--- trunk/source/main/RoR.list 2011-01-30 13:31:09 UTC (rev 1605)
+++ trunk/source/main/RoR.list 2011-01-30 14:43:48 UTC (rev 1606)
@@ -3,6 +3,7 @@
gui_mp.h
gui_inputmanager.h
gui_manager.h
+ DecalManager.h
gui_menu.h
MapControl.h
MapEntity.h
@@ -41,10 +42,6 @@
as_ogre.h
luasystem.h
ScriptEngine.h
- angelscript/scriptmath/scriptmath.h
- angelscript/scripthelper/scripthelper.h
- angelscript/scriptmath3d/scriptmath3d.h
- angelscript/scriptstdstring/scriptstdstring.h
aeroengine.h
airbrake.h
Airfoil.h
@@ -124,6 +121,7 @@
DotSceneLoader.cpp
gui_inputmanager.cpp
gui_manager.cpp
+ DecalManager.cpp
gui_menu.cpp
MapControl.cpp
MapEntity.cpp
@@ -156,10 +154,6 @@
as_ogre.cpp
luasystem.cpp
ScriptEngine.cpp
- angelscript/scriptmath/scriptmath.cpp
- angelscript/scripthelper/scripthelper.cpp
- angelscript/scriptmath3d/scriptmath3d.cpp
- angelscript/scriptstdstring/scriptstdstring.cpp
airbrake.cpp
Airfoil.cpp
Beam.cpp
@@ -323,6 +317,8 @@
WaterOld.h
writeTextToTexture.cpp
writeTextToTexture.h
+ DecalManager.cpp
+ DecalManager.h
)
SOURCE_GROUP("Script Engine" FILES
as_ogre.cpp
@@ -331,14 +327,6 @@
luasystem.h
ScriptEngine.cpp
ScriptEngine.h
- angelscript/scripthelper/scripthelper.cpp
- angelscript/scripthelper/scripthelper.h
- angelscript/scriptmath/scriptmath.cpp
- angelscript/scriptmath/scriptmath.h
- angelscript/scriptmath3d/scriptmath3d.cpp
- angelscript/scriptmath3d/scriptmath3d.h
- angelscript/scriptstdstring/scriptstdstring.cpp
- angelscript/scriptstdstring/scriptstdstring.h
)
SOURCE_GROUP("Beam Engine" FILES
aeroengine.h
Modified: trunk/source/main/ScriptEngine.cpp
===================================================================
--- trunk/source/main/ScriptEngine.cpp 2011-01-30 13:31:09 UTC (rev 1605)
+++ trunk/source/main/ScriptEngine.cpp 2011-01-30 14:43:48 UTC (rev 1606)
@@ -23,9 +23,20 @@
#include "ScriptEngine.h"
#include "Ogre.h"
#include "RoRFrameListener.h"
-#include "angelscript/scriptstdstring/scriptstdstring.h" // angelscript addon
-#include "angelscript/scriptmath3d/scriptmath3d.h" // angelscript addon
-#include "angelscript/scriptmath/scriptmath.h" // angelscript addon
+
+// AS addons start
+#include "scriptstdstring/scriptstdstring.h"
+#include "scriptmath3d/scriptmath3d.h"
+#include "scriptmath/scriptmath.h"
+#include "contextmgr/contextmgr.h"
+#include "scriptany/scriptany.h"
+#include "scriptarray/scriptarray.h"
+#include "scriptbuilder/scriptbuilder.h"
+#include "scriptdictionary/scriptdictionary.h"
+#include "scripthelper/scripthelper.h"
+#include "scriptstring/scriptstring.h"
+// AS addons end
+
#include "water.h"
#include "Beam.h"
#include "Settings.h"
@@ -265,6 +276,11 @@
AngelScript::RegisterStdString(engine);
AngelScript::RegisterScriptMath(engine);
AngelScript::RegisterScriptMath3D(engine);
+ AngelScript::RegisterScriptAny(engine);
+ AngelScript::RegisterScriptArray(engine, true);
+ AngelScript::RegisterScriptDictionary(engine);
+ //AngelScript::RegisterScriptString(engine);
+ //AngelScript::RegisterScriptStringUtils(engine);
registerOgreObjects(engine);
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
