Revision: 2617
http://rigsofrods.svn.sourceforge.net/rigsofrods/?rev=2617&view=rev
Author: rorthomas
Date: 2012-05-21 22:54:48 +0000 (Mon, 21 May 2012)
Log Message:
-----------
fixed cmake for tdr2js
Modified Paths:
--------------
trunk/source/main/gameplay/TwoDReplay.h
trunk/source/twodreplay/CMakeLists.txt
trunk/source/twodreplay/main.cpp
Modified: trunk/source/main/gameplay/TwoDReplay.h
===================================================================
--- trunk/source/main/gameplay/TwoDReplay.h 2012-05-21 22:42:04 UTC (rev
2616)
+++ trunk/source/main/gameplay/TwoDReplay.h 2012-05-21 22:54:48 UTC (rev
2617)
@@ -20,7 +20,7 @@
#ifndef __TwoDReplay_H_
#define __TwoDReplay_H_
-#include "RoRPrerequisites.h"
+#include <vector>
/** FILE FORMAT
*
Modified: trunk/source/twodreplay/CMakeLists.txt
===================================================================
--- trunk/source/twodreplay/CMakeLists.txt 2012-05-21 22:42:04 UTC (rev
2616)
+++ trunk/source/twodreplay/CMakeLists.txt 2012-05-21 22:54:48 UTC (rev
2617)
@@ -1,100 +1,5 @@
project(RoR_TDR2JS)
-#setup libraries
-macro(setup_lib name)
- if(ROR_USE_${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} Enabled: \tYES")
- #message(STATUS "${name}_INCLUDE_DIRS: \t${${name}_INCLUDE_DIRS}")
- #if(${${name}_LIBRARY_DIRS})
- # message(STATUS "${name}_LIBRARY_DIRS: \t${${name}_LIBRARY_DIRS}")
- #endif(${${name}_LIBRARY_DIRS})
- #message(STATUS "${name}_LIBRARIES: \t${${name}_LIBRARIES}")
- else()
- #message(STATUS "${name} Enabled: \tNO")
- endif(ROR_USE_${name})
-endmacro(setup_lib)
+include_directories(${RoR_Main_SOURCE_DIR}/gameplay/)
-if(WIN32)
- # use precompiled stuff
- set(wxWidgets_INCLUDE_DIRS
"${ROR_DEPENDENCIES_DIR}/includes/${ARCH_DIR}/WxWidgets" CACHE PATH "The
wxWidgets include path to use")
- set(wxWidgets_LIBRARY_DIRS
"${ROR_DEPENDENCIES_DIR}/libs/${ARCH_DIR}/WxWidgets/Release" CACHE PATH "The
wxWidgets lib path to use")
- set(wxWidgets_LIBRARIES
"wxbase29u.lib;wxmsw29u_core.lib;wxmsw29u_html.lib;wxbase29u_net.lib;wxmsw29u_adv.lib;wxpng.lib;wxtiff.lib;wxjpeg.lib;wxzlib.lib;wxregexu.lib;wxexpat.lib;winmm.lib;comctl32.lib;rpcrt4.lib;wsock32.lib;"
CACHE STRING "The wxWidgets lib to link against")
- add_definitions("-D_UNICODE -D_CRT_SECURE_NO_WARNINGS -DUNICODE")
- include_directories(${wxWidgets_INCLUDE_DIRS})
- link_directories (${wxWidgets_LIBRARY_DIRS})
-else(WIN32)
- # find wxwidgets
- SET(wxWidgets_USE_UNICODE ON)
- FIND_PACKAGE(wxWidgets REQUIRED COMPONENTS base core html net adv)
- include( ${wxWidgets_USE_FILE} )
- #include_directories(${wxWidgets_INCLUDE_DIRS})
- #add_definitions("-D${wxWidgets_DEFINITIONS}" ${wxWidgets_CXX_FLAGS})
- #link_directories (${wxWidgets_LIB_DIR})
-endif(WIN32)
-
-IF(WIN32)
- include_directories(${Boost_INCLUDE_DIRS})
- 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_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")
-
-
- #now: delay loading for opencl
- if(ROR_USE_OPENCL)
- set(CMAKE_EXE_LINKER_FLAGS_DEBUG
"${CMAKE_EXE_LINKER_FLAGS_DEBUG} /DELAYLOAD:OpenCL.dll")
- set(CMAKE_EXE_LINKER_FLAGS_RELEASE
"${CMAKE_EXE_LINKER_FLAGS_RELEASE} /DELAYLOAD:OpenCL.dll")
- set(CMAKE_EXE_LINKER_FLAGS_MINSIZEREL
"${CMAKE_EXE_LINKER_FLAGS_MINSIZEREL} /DELAYLOAD:OpenCL.dll")
- set(CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO
"${CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO} /DELAYLOAD:OpenCL.dll")
- set(OS_LIBS ${OS_LIBS} Delayimp.lib)
- endif(ROR_USE_OPENCL)
-
- setup_lib(CRASHRPT)
-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_LIBS "")
-
-ENDIF(WIN32)
-
-setup_lib(OPENCL)
-setup_lib(OPENAL)
-
-include_directories(${Ogre_INCLUDE_DIRS})
-link_directories (${Ogre_LIBRARY_DIRS})
-include_directories(${Ois_INCLUDE_DIRS})
-link_directories (${Ois_LIBRARY_DIRS})
-include_directories(${RoR_SOURCE_DIR}/source/protocol)
-
-add_definitions("-DNOOGRE -D_UNICODE")
-include_directories(../main/)
-include_directories(../main/gameplay/)
-include_directories(../main/physics)
-
-FILE(GLOB sources "*.cpp")
-FILE(GLOB headers "*.h")
-
-IF(WIN32)
- add_executable(twodreplay WIN32 ${sources} ${headers} ${OS_SOURCE}
../main/utils/Settings.cpp ../main/utils/errorutils.cpp ../main/utils/utils.cpp)
- TARGET_LINK_LIBRARIES(twodreplay Version.lib)
-ELSE(WIN32)
- add_executable(twodreplay ${sources} ${headers} ${OS_SOURCE}
../main/utils/Settings.cpp ../main/utils/errorutils.cpp ../main/utils/utils.cpp)
-ENDIF(WIN32)
-
-TARGET_LINK_LIBRARIES(twodreplay ${Ogre_LIBRARIES} ${Ois_LIBRARIES} ${OS_LIBS}
${optional_libs} ${wxWidgets_LIBRARIES})
+add_executable(tdr2js main.cpp)
Modified: trunk/source/twodreplay/main.cpp
===================================================================
--- trunk/source/twodreplay/main.cpp 2012-05-21 22:42:04 UTC (rev 2616)
+++ trunk/source/twodreplay/main.cpp 2012-05-21 22:54:48 UTC (rev 2617)
@@ -19,9 +19,9 @@
*/
#include "TwoDReplay.h"
-#include "BeamData.h"
+//#include "BeamData.h" // we dont want that here for these consts
-using namespace Ogre;
+#define MAX_TRUCKS 64
const char colors[10][8] = {
"#FF4848",
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Rigsofrods-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/rigsofrods-devel
