[Perceptioncrash-commit] SF.net SVN: perceptioncrash: [69] trunk/perceptioncrash

[<sik...@us...>]

Revision: 69
Author:   sik0fewl
Date:     2006-05-25 16:04:17 -0700 (Thu, 25 May 2006)
ViewCVS:  http://svn.sourceforge.net/perceptioncrash/?rev=69&view=rev

Log Message:
-----------
Added SDL to build
Fixed Factory for MSVC++

Modified Paths:
--------------
    trunk/perceptioncrash/README
    trunk/perceptioncrash/configure.ac
    trunk/perceptioncrash/src/Factory.hpp
    trunk/perceptioncrash/src/IntroState.cpp
    trunk/perceptioncrash/src/Jamfile

Removed Paths:
-------------
    trunk/perceptioncrash/lib/sdl/
Modified: trunk/perceptioncrash/README
===================================================================
--- trunk/perceptioncrash/README	2006-05-25 21:04:57 UTC (rev 68)
+++ trunk/perceptioncrash/README	2006-05-25 23:04:17 UTC (rev 69)
@@ -11,3 +11,4 @@
     OGRE >= 1.2.0
     CEGUI >= 0.4.1
     Boost
+    SDL >= 1.2.4

Modified: trunk/perceptioncrash/configure.ac
===================================================================
--- trunk/perceptioncrash/configure.ac	2006-05-25 21:04:57 UTC (rev 68)
+++ trunk/perceptioncrash/configure.ac	2006-05-25 23:04:17 UTC (rev 69)
@@ -65,7 +65,6 @@
 #----------------------------------------------------------------------------
 # find libraries
 #----------------------------------------------------------------------------
-#AM_PATH_SDL([1.2.5])
 
 PKG_CHECK_MODULES([OGRE], [OGRE >= 1.2.0])
 PKG_CHECK_MODULES([CEGUI], [CEGUI >= 0.4.1])
@@ -81,6 +80,13 @@
          [AC_MSG_ERROR([Unable to find libCEGUIOgreRenderer. Please check your Ogre3d installation.])],
          [$OGRE_CFLAGS $CEGUI_CFLAGS], [$OGRE_LIBS $CEGUI_LIBS])
 
+# Check for SDL
+SDL_VERSION=1.2.4
+AM_PATH_SDL($SDL_VERSION,
+            :,
+            AC_MSG_ERROR([*** SDL version $SDL_VERSION not found!]))
+
+
 # do jam specific fixes
 AC_INIT_JAM
 

Modified: trunk/perceptioncrash/src/Factory.hpp
===================================================================
--- trunk/perceptioncrash/src/Factory.hpp	2006-05-25 21:04:57 UTC (rev 68)
+++ trunk/perceptioncrash/src/Factory.hpp	2006-05-25 23:04:17 UTC (rev 69)
@@ -77,8 +77,8 @@
     RegisterFactory(std::string const &id)
     {
         FactoryType::factory().register_(id,
-            static_cast<T* (*)()>&(RegisterFactory<T, U>::newCreator),
-            static_cast<T* (*)(TiXmlElement*)>&(RegisterFactory<T, U>::newCreator));
+            static_cast<T* (*)()>(&RegisterFactory<T, U>::newCreator),
+            static_cast<T* (*)(TiXmlElement*)>(&RegisterFactory<T, U>::newCreator));
     }
 };
 

Modified: trunk/perceptioncrash/src/IntroState.cpp
===================================================================
--- trunk/perceptioncrash/src/IntroState.cpp	2006-05-25 21:04:57 UTC (rev 68)
+++ trunk/perceptioncrash/src/IntroState.cpp	2006-05-25 23:04:17 UTC (rev 69)
@@ -23,7 +23,7 @@
 
     mExitGame = false;
 
-	mTimerID = SDL_AddTimer(3000, IntroState::timerCallback, this);
+    mTimerID = SDL_AddTimer(3000, IntroState::timerCallback, this);
 
 }
 
@@ -88,7 +88,7 @@
 
 Uint32 IntroState::timerCallback(Uint32 interval, void* param)
 {
-	IntroState::getInstance()->changeState(MainMenuState::getInstance());
+    IntroState::getInstance()->changeState(MainMenuState::getInstance());
 
-	return 0;
-}
\ No newline at end of file
+    return 0;
+}

Modified: trunk/perceptioncrash/src/Jamfile
===================================================================
--- trunk/perceptioncrash/src/Jamfile	2006-05-25 21:04:57 UTC (rev 68)
+++ trunk/perceptioncrash/src/Jamfile	2006-05-25 23:04:17 UTC (rev 69)
@@ -15,7 +15,7 @@
 
 Application perceptioncrash : $(sources) ;
 LinkWith perceptioncrash : tinyxml ;
-ExternalLibs perceptioncrash : OGRE CEGUI CEGUIOGRERENDERER ;
+ExternalLibs perceptioncrash : OGRE CEGUI CEGUIOGRERENDERER SDL ;
 
 # Construct a description for the help target
 Help perceptioncrash : "Build the Perception Crash executable" ;


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