Changeset 754

Timestamp:

Dec 31, 2007, 10:33:35 AM (16 years ago)

Author:

rgrieder

Message:

• some unstable changes to CMLs

Location:

code/branches/FICN_test

Files:

• bin/levels/sample.oxw (modified) (3 diffs)
• src/orxonox/CMakeLists.txt (modified) (2 diffs)
• src/orxonox/OrxonoxPlatform.h (modified) (1 diff)
• src/orxonox/objects/CMakeLists.txt (modified) (2 diffs)
• src/orxonox/objects/weapon (moved) (moved from code/branches/FICN_test/src/orxonox/objects/weapon_system)
• src/orxonox/objects/weapon/CMakeLists.txt (added)
• src/orxonox/tools/CMakeLists.txt (modified) (2 diffs)
• src/util/CMakeLists.txt (modified) (1 diff)
• src/util/tinyxml/CMakeLists.txt (added)

code/branches/FICN_test/bin/levels/sample.oxw

@@ -12 +12 @@
 
 
- <audio>
+ <!--audio>
                 <ambient>
                         <ogg src="allgorythm-lift_up" />
@@ -20 +20 @@
                         <ogg src="tha_silent_partner_-_void" />
                 </ambient>
-  </audio>
+  </audio-->
 
   <!-- Keep a minimum distance of >100 to the object, otherwise the camara thinks it's in the object -->
@@ -30 +30 @@
   <world>
     <Ambient colourvalue="1,1,1" />
-    <Skybox src="Orxonox/StarfieldSkyBox" />
+    <Skybox src="Orxonox/StarSkyBox" />
 
     <!--Fighter camera="true" position="0,0,0" scale="10" yaw="-90" pitch="-90" mesh="assf3.mesh"  forward="500" rotateupdown="200" rotaterightleft="200" looprightleft="200" /-->

code/branches/FICN_test/src/orxonox/CMakeLists.txt

@@ -3 +3 @@
 ADD_SUBDIRECTORY(core)
 ADD_SUBDIRECTORY(hud)
-IF(NOT WIN32)
-  ADD_SUBDIRECTORY(objects)
-  ADD_SUBDIRECTORY(tools)
-ENDIF(NOT WIN32)
+ADD_SUBDIRECTORY(objects)
+ADD_SUBDIRECTORY(tools)
 ADD_SUBDIRECTORY(particle)
 
@@ -20 +18 @@
 IF(WIN32)
   SET( OBJECTS_SRC_FILES
-    objects/WorldEntity.cc
-    objects/test1.cc
-    objects/test2.cc
-    objects/test3.cc
-    objects/Ambient.cc
-    objects/Skybox.cc
-    objects/Camera.cc
-#    objects/SpaceshipSteeringObject.cc
-    objects/Fighter.cc
-    objects/Model.cc
-    objects/SpaceShip.cc
-    objects/NPC.cc
-    objects/Projectile.cc
-    objects/weapon_system/AmmunitionDump.cc
-    objects/weapon_system/BarrelGun.cc
-    objects/weapon_system/BaseWeapon.cc
-    objects/weapon_system/Bullet.cc
-    objects/weapon_system/BulletManager.cc
-    objects/weapon_system/WeaponStation.cc
-    objects/Explosion.cc
-    tools/BillboardSet.cc
-    tools/Light.cc
-    tools/Mesh.cc
+    ${OBJECTS_SRC_FILES}
+    ${TOOLS_SRC_FILES}
   )
 ELSE(WIN32)

code/branches/FICN_test/src/orxonox/OrxonoxPlatform.h

@@ -211 +211 @@
 
 // disable: "conversion from 'double' to 'float', possible loss of data
-//#   pragma warning (disable : 4244)
+#   pragma warning (disable : 4244)
+
+// disable: "conversion from 'size_t' to 'unsigned int', possible loss of data
+#   pragma warning (disable : 4267)
 
 // disable: "truncation from 'double' to 'float'

code/branches/FICN_test/src/orxonox/objects/CMakeLists.txt

@@ -1 +1 @@
 PROJECT(Orxonox)
 
-INCLUDE_DIRECTORIES(../tools)
+ADD_SUBDIRECTORY(weapon)
 
 SET( OBJECTS_SRC_FILES
@@ -18 +18 @@
   test2.cc
   test3.cc
-  weapon_system/AmmunitionDump.cc
-  weapon_system/BarrelGun.cc
-  weapon_system/BaseWeapon.cc
-  weapon_system/Bullet.cc
-  weapon_system/BulletManager.cc
-  weapon_system/WeaponStation.cc
+  ${WEAPON_SRC_FILES}
 )
 
-ADD_LIBRARY(objects SHARED ${OBJECTS_SRC_FILES})
+IF (NOT WIN32)
+  ADD_LIBRARY(objects SHARED ${OBJECTS_SRC_FILES})
 
-TARGET_LINK_LIBRARIES( objects
-  util
-  orxonox
-  tools
-)
+  TARGET_LINK_LIBRARIES( objects
+    util
+    orxonox
+    tools
+  )
+ENDIF (NOT WIN32)

code/branches/FICN_test/src/orxonox/tools/CMakeLists.txt

@@ -1 +1 @@
 PROJECT(Orxonox)
 
-SET(SRC_FILES
+SET (TOOLS_SRC_FILES
   BillboardSet.cc
   Light.cc
@@ -8 +8 @@
 
 IF(WIN32)
-  ADD_LIBRARY(tools ${SRC_FILES})
+  ADD_LIBRARY(tools ${TOOLS_SRC_FILES})
 ELSE(WIN32)
-  ADD_LIBRARY(tools SHARED ${SRC_FILES})
+  ADD_LIBRARY(tools SHARED ${TOOLS_SRC_FILES})
 ENDIF(WIN32)

code/branches/FICN_test/src/util/CMakeLists.txt

@@ -1 +1 @@
 PROJECT(Orxonox)
 
-PROJECT(Orxonox)
+ADD_SUBDIRECTORY(tinyxml)
 
-INCLUDE_DIRECTORIES(tinyxml)
-
-SET (SRC_FILES
-  tinyxml/tinystr.cc
-  tinyxml/tinyxml.cc
-  tinyxml/tinyxmlerror.cc
-  tinyxml/tinyxmlparser.cc
-  tinyxml/ticpp.cc
+SET (UTIL_SRC_FILES
   substring.cc
+  ${TINYXML_SRC_FILES}
 )
 
 IF(WIN32)
-  ADD_LIBRARY(util ${SRC_FILES})
+  ADD_LIBRARY(util ${UTIL_SRC_FILES})
 ELSE(WIN32)
-  ADD_LIBRARY(util SHARED ${SRC_FILES})
+  ADD_LIBRARY(util SHARED ${UTIL_SRC_FILES})
 ENDIF(WIN32)
-