Changeset 19 for code/branches

Timestamp:

Oct 10, 2007, 10:36:17 AM (17 years ago)

Author:

nicolasc

Message:

bump

Location:

code/branches/tutorial/Tutorial

Files:

• CMakeLists.txt (modified) (3 diffs)
• main.cpp (modified) (2 diffs)

code/branches/tutorial/Tutorial/CMakeLists.txt

@@ -1 +1 @@
 PROJECT (Tutorial)
 
-SET (MAIN_SRC main.cpp ExampleApplication.h ExampleFrameListener.h ExampleLoadingBar.h )
+SET (MAIN_SRC main.cpp)
 
 ADD_EXECUTABLE (main ${MAIN_SRC})
@@ -10 +10 @@
 IF (OGRE_LIBS)
   TARGET_ADD_LIBRARY (main OGRE_LIBS)
+  TARGET_LINK_LIBARIES (main OGRE_LIBS)
 ENDIF (OGRE_LIBS)
 
@@ -17 +18 @@
 IF (OIS_LIBS)
   ADD_LIBRARY (OIS_LIBS)
+  TARGET_LINK_LIBARIES (main OIS_LIBS)
 ENDIF (OIS_LIBS)
 
-INCLUDE_DIRECTORIES (main . /usr/pack/ois-1.0-sd/i686-debian-linux3.1/include /usr/pack/ogre-1.4.5-sd/i686-debian-linux3.1/include)
+INCLUDE_DIRECTORIES (. /usr/pack/ois-1.0-sd/i686-debian-linux3.1/include /usr/pack/ogre-1.4.5-sd/i686-debian-linux3.1/include)

code/branches/tutorial/Tutorial/main.cpp

@@ -58 +58 @@
 };
 
-#if OGRE_PLATFORM == OGRE_PLATFORM_WIN32
-#define WIN32_LEAN_AND_MEAN
-#include "windows.h"
+//#if OGRE_PLATFORM == OGRE_PLATFORM_WIN32
+//#define WIN32_LEAN_AND_MEAN
+//#include "windows.h"
 
-INT WINAPI WinMain( HINSTANCE hInst, HINSTANCE, LPSTR strCmdLine, INT )
-#else
+//INT WINAPI WinMain( HINSTANCE hInst, HINSTANCE, LPSTR strCmdLine, INT )
+//#else
 int main(int argc, char **argv)
-#endif
+//#endif
 {
     // Create application object
@@ -73 +73 @@
         app.go();
     } catch( Exception& e ) {
-#if OGRE_PLATFORM == OGRE_PLATFORM_WIN32
-        MessageBox( NULL, e.getFullDescription().c_str(), "An exception has occurred!", MB_OK | MB_ICONERROR | MB_TASKMODAL);
-#else
+//#if OGRE_PLATFORM == OGRE_PLATFORM_WIN32
+//        MessageBox( NULL, e.getFullDescription().c_str(), "An exception has occurred!", MB_OK | MB_ICONERROR | MB_TASKMODAL);
+//#else
         fprintf(stderr, "An exception has occurred: %s\n",
                 e.getFullDescription().c_str());
-#endif
+//#endif
     }