Revision: 1376
http://rigsofrods.svn.sourceforge.net/rigsofrods/?rev=1376&view=rev
Author: rorthomas
Date: 2010-05-05 21:29:36 +0000 (Wed, 05 May 2010)
Log Message:
-----------
fixed compilation problems
Modified Paths:
--------------
trunk/source/CMakeLists.txt
trunk/source/main/ExampleFrameListener.cpp
trunk/source/main/RigsOfRods.cpp
Modified: trunk/source/CMakeLists.txt
===================================================================
--- trunk/source/CMakeLists.txt 2010-05-05 21:14:26 UTC (rev 1375)
+++ trunk/source/CMakeLists.txt 2010-05-05 21:29:36 UTC (rev 1376)
@@ -11,3 +11,8 @@
IF(ROR_BUILD_INSTALLER)
add_subdirectory(installer)
ENDIF(ROR_BUILD_INSTALLER)
+
+set(ROR_BUILD_EDITOR "FALSE" CACHE BOOL "build the editor")
+IF(ROR_BUILD_EDITOR)
+ add_subdirectory(editor)
+ENDIF(ROR_BUILD_EDITOR)
Modified: trunk/source/main/ExampleFrameListener.cpp
===================================================================
--- trunk/source/main/ExampleFrameListener.cpp 2010-05-05 21:14:26 UTC (rev
1375)
+++ trunk/source/main/ExampleFrameListener.cpp 2010-05-05 21:29:36 UTC (rev
1376)
@@ -24,7 +24,7 @@
#include "hdrlistener.h"
#include "softshadowlistener.h"
#include "ssaolistener.h"
-#include "main.h"
+#include "RigsOfRods.h"
#include "utils.h"
#include "ScopeLog.h"
#include "DepthOfFieldEffect.h"
Modified: trunk/source/main/RigsOfRods.cpp
===================================================================
--- trunk/source/main/RigsOfRods.cpp 2010-05-05 21:14:26 UTC (rev 1375)
+++ trunk/source/main/RigsOfRods.cpp 2010-05-05 21:29:36 UTC (rev 1376)
@@ -242,6 +242,7 @@
//mRoot->setFrameSmoothingPeriod(2.0);
#if OGRE_PLATFORM == OGRE_PLATFORM_WIN32
+#ifndef _UNICODE
size_t hWnd = 0;
mWindow->getCustomAttribute("WINDOW", &hWnd);
@@ -249,14 +250,14 @@
::GetModuleFileNameA(0, (LPCH)&buf, MAX_PATH);
HINSTANCE instance = ::GetModuleHandleA(buf);
-
HICON hIcon = ::LoadIconA(instance, MAKEINTRESOURCE(1001));
if (hIcon)
{
::SendMessageA((HWND)hWnd, WM_SETICON, 1, (LPARAM)hIcon);
::SendMessageA((HWND)hWnd, WM_SETICON, 0, (LPARAM)hIcon);
}
-#endif
+#endif //_UNICODE
+#endif //OGRE_PLATFORM_WIN32
// load all resources now, so the zip files are also initiated
LogManager::getSingleton().logMessage("initialiseAllResourceGroups()");
@@ -270,9 +271,11 @@
//rgm.initialiseResourceGroup(ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME);
+#ifndef NOLANG
// load language, must happen after initializing Settings class and
Ogre Root!
// also it must happen after loading all basic resources!
LanguageEngine::Instance().setup();
+#endif //NOLANG
// Create the scene
LogManager::getSingleton().logMessage("createScene()");
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
_______________________________________________
Rigsofrods-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/rigsofrods-devel
