Revision: 1408
http://rigsofrods.svn.sourceforge.net/rigsofrods/?rev=1408&view=rev
Author: rorthomas
Date: 2010-06-22 23:44:58 +0000 (Tue, 22 Jun 2010)
Log Message:
-----------
fixed building under linux (ubuntu)
Modified Paths:
--------------
trunk/source/configurator/CMakeLists.txt
trunk/source/installer/CMakeLists.txt
trunk/source/installer/wizard.cpp
Modified: trunk/source/configurator/CMakeLists.txt
===================================================================
--- trunk/source/configurator/CMakeLists.txt 2010-06-21 00:53:24 UTC (rev
1407)
+++ trunk/source/configurator/CMakeLists.txt 2010-06-22 23:44:58 UTC (rev
1408)
@@ -1,30 +1,37 @@
project(RoR_Configurator)
IF(WIN32)
- include_directories(${BOOST_INCLUDE_DIRS})
- link_directories (${BOOST_LIBRARY_DIRS})
- include_directories(${PThread_INCLUDE_DIRS})
- link_directories (${PThread_LIBRARY_DIRS})
- include_directories(${WXWIDGETS_SHARED_INCLUDE_DIRS})
- link_directories (${WXWIDGETS_SHARED_LIBRARY_DIRS})
-
- set(OS_LIBS "${PThread_LIBRARIES} dinput8.lib dxguid.lib")
- set(OS_SOURCE "icon.rc")
+ include_directories(${BOOST_INCLUDE_DIRS})
+ link_directories (${BOOST_LIBRARY_DIRS})
+ include_directories(${PThread_INCLUDE_DIRS})
+ link_directories (${PThread_LIBRARY_DIRS})
+ include_directories(${WXWIDGETS_SHARED_INCLUDE_DIRS})
+ link_directories (${WXWIDGETS_SHARED_LIBRARY_DIRS})
- # disable some annoying VS warnings:
- # warning C4244: 'initializing' : conversion from 'const float' to 'int',
possible loss of data
- # warning C4305: 'initializing' : truncation from 'double' to 'const float'
- add_definitions("/wd4305 /wd4244")
+ set(OS_LIBS "${PThread_LIBRARIES} dinput8.lib dxguid.lib")
+ set(OS_SOURCE "icon.rc")
+ # disable some annoying VS warnings:
+ # warning C4244: 'initializing' : conversion from 'const float' to 'int',
possible loss of data
+ # warning C4305: 'initializing' : truncation from 'double' to 'const float'
+ add_definitions("/wd4305 /wd4244")
+
ELSEIF(UNIX)
- find_package(PkgConfig)
- PKG_CHECK_MODULES (GTK gtk+-2.0 REQUIRED)
- INCLUDE_DIRECTORIES(${GTK_INCLUDE_DIRS})
+ find_package(PkgConfig)
+ PKG_CHECK_MODULES (GTK gtk+-2.0 REQUIRED)
+ INCLUDE_DIRECTORIES(${GTK_INCLUDE_DIRS})
- PKG_CHECK_MODULES (Ogre OGRE REQUIRED)
- PKG_CHECK_MODULES (Ois OIS REQUIRED)
+ PKG_CHECK_MODULES (Ogre OGRE REQUIRED)
+ PKG_CHECK_MODULES (Ois OIS REQUIRED)
- set(OS_SOURCE "")
+ # find wxwidgets
+ SET(wxWidgets_USE_UNICODE ON)
+ FIND_PACKAGE(wxWidgets REQUIRED COMPONENTS base core html net adv)
+ include_directories(${wxWidgets_INCLUDE_DIRS})
+ add_definitions("-D${wxWidgets_DEFINITIONS}" ${wxWidgets_CXX_FLAGS})
+ link_directories (${wxWidgets_LIB_DIR})
+
+ set(OS_LIBS "${wxWidgets_LIBRARIES}")
ENDIF(WIN32)
include_directories(${Ogre_INCLUDE_DIRS})
@@ -36,10 +43,10 @@
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")
+ # 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)
Modified: trunk/source/installer/CMakeLists.txt
===================================================================
--- trunk/source/installer/CMakeLists.txt 2010-06-21 00:53:24 UTC (rev
1407)
+++ trunk/source/installer/CMakeLists.txt 2010-06-22 23:44:58 UTC (rev
1408)
@@ -20,17 +20,27 @@
IF(WIN32)
- add_definitions("-D__WIN32__ -D_CRT_SECURE_NO_WARNINGS -DPLATFORM=1
-DWIN32_LEAN_AND_MEAN")
- link_directories ("C:\\Program Files\\boost\\boost_1_39\\lib")
- link_directories ("C:\\Program Files (x86)\\boost\\boost_1_39\\lib")
- link_directories ("C:\\wxWidgets-2.9.0-static\\lib\\vc_lib")
+ add_definitions("-D__WIN32__ -D_CRT_SECURE_NO_WARNINGS -DPLATFORM=1
-DWIN32_LEAN_AND_MEAN")
+ link_directories ("C:\\Program Files\\boost\\boost_1_39\\lib")
+ link_directories ("C:\\Program Files (x86)\\boost\\boost_1_39\\lib")
+ link_directories ("C:\\wxWidgets-2.9.0-static\\lib\\vc_lib")
ENDIF(WIN32)
IF(UNIX)
- add_definitions("-DPLATFORM=2")
- FIND_PACKAGE(PkgConfig REQUIRED)
- PKG_CHECK_MODULES(GTK gtk+-2.0 REQUIRED)
- INCLUDE_DIRECTORIES(${GTK_INCLUDE_DIRS})
- link_directories (${wxWidgets_LIB_DIR})
+ add_definitions("-DPLATFORM=2")
+ FIND_PACKAGE(PkgConfig REQUIRED)
+ PKG_CHECK_MODULES(GTK gtk+-2.0 REQUIRED)
+ INCLUDE_DIRECTORIES(${GTK_INCLUDE_DIRS})
+ link_directories (${wxWidgets_LIB_DIR})
+
+ # find wxwidgets
+ SET(wxWidgets_USE_UNICODE ON)
+ FIND_PACKAGE(wxWidgets REQUIRED COMPONENTS base core html net adv)
+ include_directories(${wxWidgets_INCLUDE_DIRS})
+ add_definitions("-D${wxWidgets_DEFINITIONS}" ${wxWidgets_CXX_FLAGS})
+ link_directories (${wxWidgets_LIB_DIR})
+
+ # and boost
+ FIND_PACKAGE(Boost REQUIRED system filesystem)
ENDIF(UNIX)
add_definitions("-DNOOGRE -D_UNICODE")
@@ -46,15 +56,12 @@
# we dont need to add ${Boost_LIBRARIES} here, could be wrong as well ...
IF(WIN32)
- SET_TARGET_PROPERTIES(installer PROPERTIES COMPILE_FLAGS "/bigobj /MT
/MP")
- SET_TARGET_PROPERTIES(installer PROPERTIES LINK_FLAGS
"/MANIFESTUAC:\"level='requireAdministrator' uiAccess='false'\"
/SUBSYSTEM:WINDOWS /NODEFAULTLIB:\"msvcprt.lib\" /NODEFAULTLIB:\"MSVCRT.lib\"")
- TARGET_LINK_LIBRARIES(installer ${WXWIDGETS_STATIC_LIBRARIES})
+ SET_TARGET_PROPERTIES(installer PROPERTIES COMPILE_FLAGS "/bigobj /MT /MP")
+ SET_TARGET_PROPERTIES(installer PROPERTIES LINK_FLAGS
"/MANIFESTUAC:\"level='requireAdministrator' uiAccess='false'\"
/SUBSYSTEM:WINDOWS /NODEFAULTLIB:\"msvcprt.lib\" /NODEFAULTLIB:\"MSVCRT.lib\"")
+ TARGET_LINK_LIBRARIES(installer ${WXWIDGETS_STATIC_LIBRARIES})
ELSE(WIN32)
- #TARGET_LINK_LIBRARIES(installer ${Boost_LIBRARIES})
- #TARGET_LINK_LIBRARIES(installer ${wxWidgets_LIBRARIES})
+ TARGET_LINK_LIBRARIES(installer ${Boost_LIBRARIES})
+ TARGET_LINK_LIBRARIES(installer ${wxWidgets_LIBRARIES})
ENDIF(WIN32)
-# already in correct path, no need to install at all!
-#install(TARGETS rorconfig DESTINATION ${BIN_DIR})
-
Modified: trunk/source/installer/wizard.cpp
===================================================================
--- trunk/source/installer/wizard.cpp 2010-06-21 00:53:24 UTC (rev 1407)
+++ trunk/source/installer/wizard.cpp 2010-06-22 23:44:58 UTC (rev 1408)
@@ -24,6 +24,7 @@
// For compilers that support precompilation, includes "wx/wx.h".
#include <wx/wxprec.h>
#include <wx/filename.h>
+#include <wx/dataobj.h>
#include <wx/cmdline.h>
#include <wx/dir.h>
#include <wx/thread.h>
@@ -197,7 +198,7 @@
{
if (wxTheClipboard->Open())
{
- wxString txt = getExecutablePath() + wxT(" ") +
ConfigManager::getOwnHash() + wxT(" ") + wxT(__TIME__) + wxT(" ") +
wxT(__DATE__);
+ wxString txt = getExecutablePath() + wxT(" ") +
conv(ConfigManager::getOwnHash()) + wxT(" ") + wxT(__TIME__) + wxT(" ") +
wxT(__DATE__);
wxTheClipboard->SetData(new wxTextDataObject(txt));
wxTheClipboard->Flush();
wxTheClipboard->Close();
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
ThinkGeek and WIRED's GeekDad team up for the Ultimate
GeekDad Father's Day Giveaway. ONE MASSIVE PRIZE to the
lucky parental unit. See the prize list and enter to win:
http://p.sf.net/sfu/thinkgeek-promo
_______________________________________________
Rigsofrods-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/rigsofrods-devel
