[Hgengine-cvs] SF.net SVN: hgengine:[569] Mercury2

[<axl...@us...>]

Revision: 569
          http://hgengine.svn.sourceforge.net/hgengine/?rev=569&view=rev
Author:   axlecrusher
Date:     2009-10-13 01:40:18 +0000 (Tue, 13 Oct 2009)

Log Message:
-----------
use terrain module

Modified Paths:
--------------
    Mercury2/adv_set.c
    Mercury2/modules.xml

Modified: Mercury2/adv_set.c
===================================================================
--- Mercury2/adv_set.c	2009-10-12 23:56:39 UTC (rev 568)
+++ Mercury2/adv_set.c	2009-10-13 01:40:18 UTC (rev 569)
@@ -14,7 +14,7 @@
 	src/Camera.cpp src/MercuryInput.cpp src/MQuaternion.cpp src/ModuleManager.cpp src/MercuryFBO.cpp \
 	src/GLHelpers.cpp src/FullscreenQuad.cpp src/MercuryNamedResource.cpp src/MercuryPrefs.cpp \
 	src/MercuryTheme.cpp src/Orthographic.cpp src/Light.cpp src/RenderDifferedLights.cpp \
-	src/MercuryLog.cpp src/MercuryCTA.cpp"
+	src/MercuryLog.cpp src/MercuryCTA.cpp src/DataTypes/MTriangle.cpp"
 
 SOURCES="$SOURCES src/MercuryFileDriverDirect.cpp src/MercuryFileDriverMem.cpp \
 	src/MercuryFileDriverPacked.cpp src/MercuryFileDriverZipped.cpp"
@@ -31,7 +31,7 @@
 #endif
 
 PROJ="mercury"
-CFLAGS="$CFLAGS -DHAVE_CONFIG -DHGENGINE -fno-exceptions -fPIC -Isrc -g "
+CFLAGS="$CFLAGS -DHAVE_CONFIG -DHGENGINE -fno-exceptions -fPIC -Isrc -Isrc/DataStructures -Isrc/DataTypes -g "
 LDFLAGS="$LDFLAGS -rdynamic -g -fPIC "
 
 /*

Modified: Mercury2/modules.xml
===================================================================
--- Mercury2/modules.xml	2009-10-12 23:56:39 UTC (rev 568)
+++ Mercury2/modules.xml	2009-10-13 01:40:18 UTC (rev 569)
@@ -1,4 +1,5 @@
 <Modules>
 	<Module src="modules/TextNode.cpp" obj="modules/TextNode" func="InstallTextNode" />
 	<Module src="modules/BillboardNode.cpp" obj="modules/BillboardNode" func="InstallBillboardNode"/>
+	<Module src="modules/Terrain.cpp" obj="modules/Terrain" func="InstallTerrainNode"/>
 </Modules>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.