Revision: 1548
http://rigsofrods.svn.sourceforge.net/rigsofrods/?rev=1548&view=rev
Author: rorthomas
Date: 2010-12-14 18:53:42 +0000 (Tue, 14 Dec 2010)
Log Message:
-----------
cmake fixes for VS2010
fixed some VS2010 compilation warnings
removed obsolete serializer
Modified Paths:
--------------
trunk/CMakeDependenciesConfig.txt
trunk/CMakeLists.txt
trunk/source/configurator/CMakeLists.txt
trunk/source/installer/ConfigManager.cpp
trunk/source/main/BeamSlideNode.cpp
trunk/source/main/CMakeLists.txt
trunk/source/main/SelectorWindow.cpp
trunk/source/viewer/CMakeLists.txt
Removed Paths:
-------------
trunk/source/serializer/
Modified: trunk/CMakeDependenciesConfig.txt
===================================================================
--- trunk/CMakeDependenciesConfig.txt 2010-12-13 06:30:36 UTC (rev 1547)
+++ trunk/CMakeDependenciesConfig.txt 2010-12-14 18:53:42 UTC (rev 1548)
@@ -77,7 +77,7 @@
if(ROR_USE_MYGUI)
set(MYGUI_INCLUDE_DIRS
"${ROR_DEPENDENCIES_DIR}/include/MyGUI" CACHE PATH "The mygui include path to
use")
set(MYGUI_LIBRARY_DIRS "${ROR_DEPENDENCIES_DIR}/lib"
CACHE PATH "The mygui lib path to use")
- set(MYGUI_LIBRARIES "MyGUI.OgrePlatform.lib
MyGUIEngine.lib" CACHE STRING "The mygui libs to link against")
+ set(MYGUI_LIBRARIES
"MyGUI.OgrePlatform.lib;MyGUIEngine.lib" CACHE STRING "The mygui libs to link
against")
endif(ROR_USE_MYGUI)
if(ROR_USE_OPENAL)
@@ -95,7 +95,7 @@
if(ROR_USE_SOCKETW)
set(SOCKETW_INCLUDE_DIRS
"${ROR_DEPENDENCIES_DIR}/include/SocketW" CACHE PATH "The socketw include path
to use")
set(SOCKETW_LIBRARY_DIRS "${ROR_DEPENDENCIES_DIR}/lib"
CACHE PATH "The socketw lib path to use")
- set(SOCKETW_LIBRARIES "mysocketw.lib Ws2_32.lib"
CACHE STRING "The socketw lib to link against")
+ set(SOCKETW_LIBRARIES "mysocketw.lib;Ws2_32.lib"
CACHE STRING "The socketw lib to link against")
endif(ROR_USE_SOCKETW)
if(ROR_USE_MOFILEREADER)
@@ -158,7 +158,7 @@
if(ROR_USE_OPENCL)
set(OPENCL_INCLUDE_DIRS
"${OPENCL_DIR}/OpenCL/common/inc;${OPENCL_DIR}/shared/inc" CACHE PATH "The
openCL include paths to use")
set(OPENCL_LIBRARY_DIRS
"${OPENCL_DIR}/shared/lib;${OPENCL_DIR}/OpenCL/common/lib;${OPENCL_DIR}/OpenCL/common/lib/Win32"
CACHE PATH "The openCL lib paths to use")
- set(OPENCL_LIBRARIES "oclUtils32.lib shrUtils32.lib
OpenCL.lib" CACHE STRING "The openCL libs to link against")
+ set(OPENCL_LIBRARIES
"oclUtils32.lib;shrUtils32.lib;OpenCL.lib" CACHE STRING "The openCL libs to
link against")
endif(ROR_USE_OPENCL)
ELSEIF(UNIX)
Modified: trunk/CMakeLists.txt
===================================================================
--- trunk/CMakeLists.txt 2010-12-13 06:30:36 UTC (rev 1547)
+++ trunk/CMakeLists.txt 2010-12-14 18:53:42 UTC (rev 1548)
@@ -51,10 +51,10 @@
add_definitions("-D_CRT_SECURE_NO_WARNINGS")
include_directories(${DirectX_INCLUDE_DIR})
- set(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG}
/DEBUG /SUBSYSTEM:CONSOLE")
- set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE}
/DEBUG /SUBSYSTEM:WINDOWS /LTCG /OPT:REF")
- set(CMAKE_EXE_LINKER_FLAGS_MINSIZEREL
"${CMAKE_EXE_LINKER_FLAGS_MINSIZEREL} /DEBUG /SUBSYSTEM:CONSOLE /LTCG
/OPT:REF")
- set(CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO
"${CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO} /DEBUG /SUBSYSTEM:CONSOLE /LTCG
/OPT:REF")
+ set(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG}
/DEBUG")
+ set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE}
/DEBUG /LTCG /OPT:REF")
+ set(CMAKE_EXE_LINKER_FLAGS_MINSIZEREL
"${CMAKE_EXE_LINKER_FLAGS_MINSIZEREL} /DEBUG /LTCG /OPT:REF")
+ set(CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO
"${CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO} /DEBUG /LTCG /OPT:REF")
ELSEIF(UNIX)
set(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG}
-O0 -ggdb")
set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE}
-mfpmath=sse -msse2 -mmmx -msse -msse3 -m3dnow -O2 -fomit-frame-pointer
-fstrict-aliasing -ffast-math -ftracer")
@@ -66,16 +66,6 @@
endif(WIN32)
-macro(windows_hacks NAME)
-IF(WIN32)
- if (MSVC_IDE)
- # hack to get around the "Debug" and "Release" directories
cmake tries to add on Windows
- set_target_properties(${NAME} PROPERTIES PREFIX "../")
- set_target_properties(${NAME} PROPERTIES IMPORT_PREFIX "../")
- endif(MSVC_IDE)
-ENDIF(WIN32)
-endmacro(windows_hacks)
-
macro(copy_files srcDir destDir)
message(STATUS "Configuring ${destDir} ...")
#make_directory(${destDir})
Modified: trunk/source/configurator/CMakeLists.txt
===================================================================
--- trunk/source/configurator/CMakeLists.txt 2010-12-13 06:30:36 UTC (rev
1547)
+++ trunk/source/configurator/CMakeLists.txt 2010-12-14 18:53:42 UTC (rev
1548)
@@ -75,18 +75,9 @@
add_definitions("-DNOOGRE -D_UNICODE")
include_directories(../main)
-if(WIN32)
- # we have to extend the cflags to add USE_CONSOLE definition for non
release modes
- set(CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_MINSIZEREL} /D
USE_CONSOLE")
- set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /D
USE_CONSOLE")
- set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /D
USE_CONSOLE")
-endif(WIN32)
-
-
FILE(GLOB sources "*.cpp")
FILE(GLOB headers "*.h")
-add_executable(rorconfig ${sources} ${headers} ${OS_SOURCE}
../main/InputEngine.cpp)
-windows_hacks(rorconfig)
+add_executable(rorconfig WIN32 ${sources} ${headers} ${OS_SOURCE}
../main/InputEngine.cpp)
TARGET_LINK_LIBRARIES(rorconfig ${WXWIDGETS_SHARED_LIBRARIES}
${Ogre_LIBRARIES} ${Ois_LIBRARIES} ${OS_LIBS} ${optional_libs})
Modified: trunk/source/installer/ConfigManager.cpp
===================================================================
--- trunk/source/installer/ConfigManager.cpp 2010-12-13 06:30:36 UTC (rev
1547)
+++ trunk/source/installer/ConfigManager.cpp 2010-12-14 18:53:42 UTC (rev
1548)
@@ -22,9 +22,7 @@
#if OGRE_PLATFORM == OGRE_PLATFORM_WIN32
#include "wx/msw/private.h"
#include "wx/msw/registry.h"
- #include <shellapi.h> // needed for SHELLEXECUTEINFO
#include <shlobj.h>
- #include <Shfolder.h>
#endif // OGRE_PLATFORM
#include <wx/filename.h>
Modified: trunk/source/main/BeamSlideNode.cpp
===================================================================
--- trunk/source/main/BeamSlideNode.cpp 2010-12-13 06:30:36 UTC (rev 1547)
+++ trunk/source/main/BeamSlideNode.cpp 2010-12-14 18:53:42 UTC (rev 1548)
@@ -184,8 +184,8 @@
// for every slide node on this truck
for(std::vector< SlideNode >::iterator itNode = mSlideNodes.begin();
itNode != mSlideNodes.end(); itNode++)
{
- std::pair<RailGroup*, Ogre::Real> closest(NULL,
std::numeric_limits<Ogre::Real>::infinity());
- std::pair<RailGroup*, Ogre::Real> current(NULL,
std::numeric_limits<Ogre::Real>::infinity());
+ std::pair<RailGroup*, Ogre::Real> closest((RailGroup*)NULL,
std::numeric_limits<Ogre::Real>::infinity());
+ std::pair<RailGroup*, Ogre::Real> current((RailGroup*)NULL,
std::numeric_limits<Ogre::Real>::infinity());
// if neither foreign, nor self attach is set then we cannot
change the
// Rail attachments
@@ -218,7 +218,7 @@
std::pair<RailGroup*, Ogre::Real> Beam::getClosestRailOnTruck( Beam* truck,
const SlideNode& node)
{
- std::pair<RailGroup*, Ogre::Real> closest(NULL,
std::numeric_limits<Ogre::Real>::infinity());
+ std::pair<RailGroup*, Ogre::Real> closest((RailGroup*)NULL,
std::numeric_limits<Ogre::Real>::infinity());
Rail* curRail = NULL;
Ogre::Real lenToCurRail = std::numeric_limits<Ogre::Real>::infinity();
Modified: trunk/source/main/CMakeLists.txt
===================================================================
--- trunk/source/main/CMakeLists.txt 2010-12-13 06:30:36 UTC (rev 1547)
+++ trunk/source/main/CMakeLists.txt 2010-12-14 18:53:42 UTC (rev 1548)
@@ -27,7 +27,7 @@
link_directories (${BOOST_LIBRARY_DIRS})
include_directories(${PThread_INCLUDE_DIRS})
link_directories (${PThread_LIBRARY_DIRS})
- set(OS_LIBS "${PThread_LIBRARIES} dinput8.lib dxguid.lib")
+ set(OS_LIBS "${PThread_LIBRARIES};dinput8.lib;dxguid.lib")
# disable some annoying VS warnings:
# warning C4244: 'initializing' : conversion from 'const float' to 'int',
possible loss of data
@@ -76,7 +76,6 @@
add_definitions("-DFEAT_TIMING")
endif(ROR_FEAT_TIMING)
-add_executable(RoR ${HEADER_FILES} ${SOURCE_FILES})
+add_executable(RoR WIN32 ${HEADER_FILES} ${SOURCE_FILES})
target_link_libraries(RoR ${Ogre_LIBRARIES} ${Ogre_Terrain_LIBRARIES}
${Ogre_Paging_LIBRARIES} ${Ogre_RTShader_LIBRARIES} ${Ois_LIBRARIES} ${OS_LIBS}
${optional_libs})
-windows_hacks(RoR)
Modified: trunk/source/main/SelectorWindow.cpp
===================================================================
--- trunk/source/main/SelectorWindow.cpp 2010-12-13 06:30:36 UTC (rev
1547)
+++ trunk/source/main/SelectorWindow.cpp 2010-12-14 18:53:42 UTC (rev
1548)
@@ -43,21 +43,21 @@
mMainWidget->setRealPosition(0.1, 0.1);
mMainWidget->setRealSize(0.8, 0.8);
- mMainWidget->eventKeyButtonPressed = MyGUI::newDelegate(this,
&SelectorWindow::eventKeyButtonPressed_Main);
- mTypeComboBox->eventComboChangePosition = MyGUI::newDelegate(this,
&SelectorWindow::eventComboChangePositionTypeComboBox);
- mTypeComboBox->eventKeyButtonPressed = MyGUI::newDelegate(this,
&SelectorWindow::eventKeyButtonPressed_Main);
- mModelList->eventListChangePosition = MyGUI::newDelegate(this,
&SelectorWindow::eventListChangePositionModelList);
+ mMainWidget->eventKeyButtonPressed += MyGUI::newDelegate(this,
&SelectorWindow::eventKeyButtonPressed_Main);
+ mTypeComboBox->eventComboChangePosition += MyGUI::newDelegate(this,
&SelectorWindow::eventComboChangePositionTypeComboBox);
+ mTypeComboBox->eventKeyButtonPressed += MyGUI::newDelegate(this,
&SelectorWindow::eventKeyButtonPressed_Main);
+ mModelList->eventListChangePosition += MyGUI::newDelegate(this,
&SelectorWindow::eventListChangePositionModelList);
//mModelList->eventKeyButtonPressed = MyGUI::newDelegate(this,
&SelectorWindow::eventKeyButtonPressed_Main);
- mConfigComboBox->eventComboAccept = MyGUI::newDelegate(this,
&SelectorWindow::eventComboAcceptConfigComboBox);
+ mConfigComboBox->eventComboAccept += MyGUI::newDelegate(this,
&SelectorWindow::eventComboAcceptConfigComboBox);
//mConfigComboBox->eventKeyButtonPressed = MyGUI::newDelegate(this,
&SelectorWindow::eventKeyButtonPressed_Main);
- mOkButton->eventMouseButtonClick = MyGUI::newDelegate(this,
&SelectorWindow::eventMouseButtonClickOkButton);
- mCancelButton->eventMouseButtonClick = MyGUI::newDelegate(this,
&SelectorWindow::eventMouseButtonClickCancelButton);
+ mOkButton->eventMouseButtonClick += MyGUI::newDelegate(this,
&SelectorWindow::eventMouseButtonClickOkButton);
+ mCancelButton->eventMouseButtonClick += MyGUI::newDelegate(this,
&SelectorWindow::eventMouseButtonClickCancelButton);
// search stuff
- mSearchLineEdit->eventEditTextChange = MyGUI::newDelegate(this,
&SelectorWindow::eventSearchTextChange);
- mSearchLineEdit->eventMouseSetFocus = MyGUI::newDelegate(this,
&SelectorWindow::eventSearchTextGotFocus);
- mSearchLineEdit->eventKeySetFocus = MyGUI::newDelegate(this,
&SelectorWindow::eventSearchTextGotFocus);
- mSearchLineEdit->eventKeyButtonPressed = MyGUI::newDelegate(this,
&SelectorWindow::eventKeyButtonPressed_Main);
+ mSearchLineEdit->eventEditTextChange += MyGUI::newDelegate(this,
&SelectorWindow::eventSearchTextChange);
+ mSearchLineEdit->eventMouseSetFocus += MyGUI::newDelegate(this,
&SelectorWindow::eventSearchTextGotFocus);
+ mSearchLineEdit->eventKeySetFocus += MyGUI::newDelegate(this,
&SelectorWindow::eventSearchTextGotFocus);
+ mSearchLineEdit->eventKeyButtonPressed += MyGUI::newDelegate(this,
&SelectorWindow::eventKeyButtonPressed_Main);
mSelectedSkin=0;
}
Modified: trunk/source/viewer/CMakeLists.txt
===================================================================
--- trunk/source/viewer/CMakeLists.txt 2010-12-13 06:30:36 UTC (rev 1547)
+++ trunk/source/viewer/CMakeLists.txt 2010-12-14 18:53:42 UTC (rev 1548)
@@ -80,7 +80,7 @@
IF(WIN32)
include_directories(${PThread_INCLUDE_DIRS})
link_directories (${PThread_LIBRARY_DIRS})
- set(OS_LIBS "${PThread_LIBRARIES} dinput8.lib dxguid.lib")
+ set(OS_LIBS "${PThread_LIBRARIES};dinput8.lib;dxguid.lib")
# disable some annoying VS warnings:
# warning C4244: 'initializing' : conversion from 'const float' to 'int',
possible loss of data
@@ -118,7 +118,6 @@
include_directories(../main)
add_executable(RoRViewer ${viewer_sources} ${viewer_headers} ${OS_SOURCE}
${additional_sources} ${HEADER_FILES} ${SOURCE_FILES} ../main/Settings.cpp
../main/errorutils.cpp)
-windows_hacks(RoRViewer)
TARGET_LINK_LIBRARIES(RoRViewer ${WXWIDGETS_SHARED_LIBRARIES}
${Ogre_LIBRARIES} ${Ois_LIBRARIES} ${OS_LIBS} ${optional_libs})
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Lotusphere 2011
Register now for Lotusphere 2011 and learn how
to connect the dots, take your collaborative environment
to the next level, and enter the era of Social Business.
http://p.sf.net/sfu/lotusphere-d2d
_______________________________________________
Rigsofrods-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/rigsofrods-devel
