Changeset 7163 for code/trunk/src/modules/pong

Timestamp:

Aug 11, 2010, 8:55:13 AM (14 years ago)

Author:

dafrick

Message:

Merged presentation3 branch into trunk.

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/modules/pong/CMakeLists.txt (modified) (1 diff)
• src/modules/pong/PongBall.h (modified) (2 diffs)
• src/modules/pong/PongBat.h (modified) (2 diffs)
• src/modules/pong/PongPrereqs.h (modified) (1 diff)

code/trunk/src/modules/pong/CMakeLists.txt

@@ -14 +14 @@
   MODULE
   FIND_HEADER_FILES
-  DEFINE_SYMBOL
-    "PONG_SHARED_BUILD"
   LINK_LIBRARIES
     orxonox

code/trunk/src/modules/pong/PongBall.h

@@ -45 +45 @@
             virtual void tick(float dt);
 
-            void registerVariables();
-
             void setFieldDimension(float width, float height)
                 { this->fieldWidth_ = width; this->fieldHeight_ = height; }
@@ -74 +72 @@
 
         private:
+            void registerVariables();
+
             float fieldWidth_;
             float fieldHeight_;

code/trunk/src/modules/pong/PongBat.h

@@ -41 +41 @@
             virtual ~PongBat() {}
 
-            void registerVariables();
             virtual void tick(float dt);
 
@@ -65 +64 @@
 
         private:
+            void registerVariables();
+
             float movement_;
             bool bMoveLocal_;

code/trunk/src/modules/pong/PongPrereqs.h

@@ -43 +43 @@
 //-----------------------------------------------------------------------
 
-#if defined(ORXONOX_PLATFORM_WINDOWS) && !defined(ORXONOX_STATIC_BUILD)
+#if defined(ORXONOX_PLATFORM_WINDOWS) && !defined(PONG_STATIC_BUILD)
 #  ifdef PONG_SHARED_BUILD
 #    define _PongExport __declspec(dllexport)