Revision: 1711
http://rigsofrods.svn.sourceforge.net/rigsofrods/?rev=1711&view=rev
Author: rorthomas
Date: 2011-02-28 23:53:36 +0000 (Mon, 28 Feb 2011)
Log Message:
-----------
towards the editor
Modified Paths:
--------------
trunk/source/main/gameplay/RoRFrameListener.cpp
trunk/source/main/main_sim/CMakeLists.txt
trunk/source/main/main_viewer/CMakeLists.txt
Added Paths:
-----------
trunk/source/main/main_viewer/resource.h
Removed Paths:
-------------
trunk/source/main/main_viewer/CMakeLists2.txt
Modified: trunk/source/main/gameplay/RoRFrameListener.cpp
===================================================================
--- trunk/source/main/gameplay/RoRFrameListener.cpp 2011-02-28 23:26:56 UTC
(rev 1710)
+++ trunk/source/main/gameplay/RoRFrameListener.cpp 2011-02-28 23:53:36 UTC
(rev 1711)
@@ -29,7 +29,6 @@
//#include "joystick.h"
#include "ProceduralManager.h"
#include "hdrlistener.h"
-#include "RigsOfRods.h"
#include "utils.h"
#include "ScopeLog.h"
#include "DepthOfFieldEffect.h"
Modified: trunk/source/main/main_sim/CMakeLists.txt
===================================================================
--- trunk/source/main/main_sim/CMakeLists.txt 2011-02-28 23:26:56 UTC (rev
1710)
+++ trunk/source/main/main_sim/CMakeLists.txt 2011-02-28 23:53:36 UTC (rev
1711)
@@ -1,4 +1,4 @@
-project(RoR_Main)
+project(RoR)
#setup libraries
macro(setup_lib name)
@@ -88,7 +88,7 @@
add_definitions("-DBOOST_ALL_NO_LIB")
add_definitions("-DUSE_RTSHADER_SYSTEM")
-include_directories(.)
+include_directories(${RoR_Main_SOURCE_DIR})
add_sub_dir(audio)
add_sub_dir(gameplay)
add_sub_dir(gfx)
Modified: trunk/source/main/main_viewer/CMakeLists.txt
===================================================================
--- trunk/source/main/main_viewer/CMakeLists.txt 2011-02-28 23:26:56 UTC
(rev 1710)
+++ trunk/source/main/main_viewer/CMakeLists.txt 2011-02-28 23:53:36 UTC
(rev 1711)
@@ -88,7 +88,7 @@
add_definitions("-DBOOST_ALL_NO_LIB")
add_definitions("-DUSE_RTSHADER_SYSTEM")
-include_directories(.)
+include_directories(${RoR_Main_SOURCE_DIR})
add_sub_dir(audio)
add_sub_dir(gameplay)
add_sub_dir(gfx)
@@ -109,14 +109,22 @@
add_sub_dir(network/protocol)
add_sub_dir(sqlite)
add_sub_dir(framework)
-add_sub_dir(main_sim)
+add_sub_dir(main_viewer)
+# find wxWidgets
+SET(wxWidgets_USE_UNICODE ON)
+FIND_PACKAGE(wxWidgets REQUIRED COMPONENTS base core html net adv propgrid aui)
+include_directories(${wxWidgets_INCLUDE_DIRS})
+add_definitions("-D${wxWidgets_DEFINITIONS}" ${wxWidgets_CXX_FLAGS})
+link_directories (${wxWidgets_LIB_DIR})
+
+
IF(WIN32)
add_executable(RoREditor WIN32 ${headers} ${sources} icon.rc)
ELSE(WIN32)
add_executable(RoREditor ${headers} ${sources})
ENDIF(WIN32)
-target_link_libraries(RoREditor ${Ogre_LIBRARIES} ${Ogre_Terrain_LIBRARIES}
${Ogre_Paging_LIBRARIES} ${Ogre_RTShader_LIBRARIES} ${Ois_LIBRARIES} ${OS_LIBS}
${optional_libs})
+target_link_libraries(RoREditor ${wxWidgets_LIBRARIES} ${Ogre_LIBRARIES}
${Ogre_Terrain_LIBRARIES} ${Ogre_Paging_LIBRARIES} ${Ogre_RTShader_LIBRARIES}
${Ois_LIBRARIES} ${OS_LIBS} ${optional_libs})
Deleted: trunk/source/main/main_viewer/CMakeLists2.txt
===================================================================
--- trunk/source/main/main_viewer/CMakeLists2.txt 2011-02-28 23:26:56 UTC
(rev 1710)
+++ trunk/source/main/main_viewer/CMakeLists2.txt 2011-02-28 23:53:36 UTC
(rev 1711)
@@ -1,123 +0,0 @@
-project(RoR_Viewer)
-
-# find wxWidgets
-SET(wxWidgets_USE_UNICODE ON)
-FIND_PACKAGE(wxWidgets REQUIRED COMPONENTS base core html net adv propgrid aui)
-include_directories(${wxWidgets_INCLUDE_DIRS})
-add_definitions("-D${wxWidgets_DEFINITIONS}" ${wxWidgets_CXX_FLAGS})
-link_directories (${wxWidgets_LIB_DIR})
-
-IF(WIN32)
- include_directories(${BOOST_INCLUDE_DIRS})
- link_directories (${BOOST_LIBRARY_DIRS})
- include_directories(${PThread_INCLUDE_DIRS})
- link_directories (${PThread_LIBRARY_DIRS})
- include_directories(${PThread_INCLUDE_DIRS})
- link_directories (${PThread_LIBRARY_DIRS})
-
- #set(OS_LIBS "${PThread_LIBRARIES}")
- 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})
-
- PKG_CHECK_MODULES (Ogre OGRE REQUIRED)
- PKG_CHECK_MODULES (Ois OIS REQUIRED)
-
- set(OS_SOURCE "")
-ENDIF(WIN32)
-
-include_directories(${Ogre_INCLUDE_DIRS})
-link_directories (${Ogre_LIBRARY_DIRS})
-include_directories(${Ogre_Terrain_INCLUDE_DIRS})
-link_directories (${Ogre_Terrain_LIBRARY_DIRS})
-include_directories(${Ogre_Paging_INCLUDE_DIRS})
-link_directories (${Ogre_Paging_LIBRARY_DIRS})
-include_directories(${Ogre_RTShader_INCLUDE_DIRS})
-link_directories (${Ogre_RTShader_LIBRARY_DIRS})
-include_directories(${Ois_INCLUDE_DIRS})
-link_directories (${Ois_LIBRARY_DIRS})
-
-add_definitions("-D_UNICODE -DNOLANG")
-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)
-
-#setup libraries
-macro(setup_lib name)
- if(ROR_USE_${name})
- message(STATUS "Enabled: ${name}")
- include_directories(${${name}_INCLUDE_DIRS})
- link_directories (${${name}_LIBRARY_DIRS})
- add_definitions("-DUSE_${name}")
- set(optional_libs ${optional_libs} ${${name}_LIBRARIES})
- message(STATUS "${name}_INCLUDE_DIRS: ${${name}_INCLUDE_DIRS}")
- message(STATUS "${name}_LIBRARY_DIRS: ${${name}_LIBRARY_DIRS}")
- message(STATUS "${name}_LIBRARIES: ${${name}_LIBRARIES}")
- else()
- message(STATUS "Not enabled: ${name}")
- endif(ROR_USE_${name})
-endmacro(setup_lib)
-
-# config below
-IF(WIN32)
- include_directories(${PThread_INCLUDE_DIRS})
- link_directories (${PThread_LIBRARY_DIRS})
- 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
- # warning C4305: 'initializing' : truncation from 'double' to 'const float'
- add_definitions("/wd4305 /wd4244 -DNOMINMAX")
-ELSEIF(UNIX)
- include_directories(${GTK_INCLUDE_DIRS})
- set(OS_LIBS "${OS_LIBS};X11")
-ENDIF(WIN32)
-
-# required components
-include_directories(${Ogre_INCLUDE_DIRS})
-link_directories (${Ogre_LIBRARY_DIRS})
-include_directories(${Ois_INCLUDE_DIRS})
-link_directories (${Ois_LIBRARY_DIRS})
-link_directories (${Ois_LIBRARY_DIRS})
-include_directories(${RoR_SOURCE_DIR}/source/protocol)
-
-
-# things to be used but not yet supported:
-#setup_lib(OPENAL)
-#setup_lib(LUA)
-#setup_lib(PAGED)
-#setup_lib(CAELUM)
-#setup_lib(ANGELSCRIPT)
-#setup_lib(HYDRAX)
-#setup_lib(CRASHRPT)
-
-
-
-FILE(GLOB viewer_sources "*.cpp")
-FILE(GLOB viewer_headers "*.h")
-
-include_directories(.)
-include_directories(${RoR_Main_SOURCE_DIR}/main)
-
-IF(WIN32)
- add_executable(RoRViewer WIN32 ${viewer_sources} ${viewer_headers}
${OS_SOURCE} ${additional_sources} ${HEADER_FILES} ${SOURCE_FILES}
../main/Settings.cpp ../main/errorutils.cpp)
-ELSEIF(UNIX)
- add_executable(RoRViewer ${viewer_sources} ${viewer_headers}
${OS_SOURCE} ${additional_sources} ${HEADER_FILES} ${SOURCE_FILES}
../main/Settings.cpp ../main/errorutils.cpp)
-ENDIF(WIN32)
-
-TARGET_LINK_LIBRARIES(RoRViewer ${wxWidgets_LIBRARIES} ${Ogre_LIBRARIES}
${Ois_LIBRARIES} ${OS_LIBS} ${optional_libs})
-
-
Added: trunk/source/main/main_viewer/resource.h
===================================================================
--- trunk/source/main/main_viewer/resource.h (rev 0)
+++ trunk/source/main/main_viewer/resource.h 2011-02-28 23:53:36 UTC (rev
1711)
@@ -0,0 +1,35 @@
+/*
+This source file is part of Rigs of Rods
+Copyright 2005-2011 Pierre-Michel Ricordel
+Copyright 2007-2011 Thomas Fischer
+
+For more information, see http://www.rigsofrods.com/
+
+Rigs of Rods is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License version 3, as
+published by the Free Software Foundation.
+
+Rigs of Rods is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with Rigs of Rods. If not, see <http://www.gnu.org/licenses/>.
+*/
+//{{NO_DEPENDENCIES}}
+// Microsoft Developer Studio generated include file.
+// Used by icon.rc
+//
+#define IDI_ICON1 101
+
+// Next default values for new objects
+//
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_NEXT_RESOURCE_VALUE 102
+#define _APS_NEXT_COMMAND_VALUE 40001
+#define _APS_NEXT_CONTROL_VALUE 1000
+#define _APS_NEXT_SYMED_VALUE 101
+#endif
+#endif
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Free Software Download: Index, Search & Analyze Logs and other IT data in
Real-Time with Splunk. Collect, index and harness all the fast moving IT data
generated by your applications, servers and devices whether physical, virtual
or in the cloud. Deliver compliance at lower cost and gain new business
insights. http://p.sf.net/sfu/splunk-dev2dev
_______________________________________________
Rigsofrods-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/rigsofrods-devel
