Mirrors/openrw
1
0
Fork 0
mirror of https://github.com/rwengine/openrw.git synced 2024-10-06 09:07:19 +02:00
Code Issues Projects Releases Activity

Renamed Components

Browse Source
This commit is contained in:
Daniel Evans 2014-01-26 03:45:55 +00:00
parent 3f0030d3e2
commit 16b59f3943
75 changed files with 26 additions and 348 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CMakeLists.txt
View File

@ -1,14 +1,14 @@
cmake_minimum_required(VERSION 2.8)
project(gtfw)
project(OpenRW)
set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -std=c++11 -Wall" )
add_subdirectory(datadump)
add_subdirectory(viewer)
add_subdirectory(game)
add_subdirectory(rwgame)
add_subdirectory(rwviewer)
add_subdirectory(rwengine)
add_subdirectory(framework2)
add_subdirectory(analyzer)
add_subdirectory(tests)

321
CMakeLists.txt.user
View File

@ -1,321 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE QtCreatorProject>
<!-- Written by QtCreator 2.7.0, 2013-09-21T00:32:17. -->
<qtcreator>
<data>
<variable>ProjectExplorer.Project.ActiveTarget</variable>
<value type="int">0</value>
</data>
<data>
<variable>ProjectExplorer.Project.EditorSettings</variable>
<valuemap type="QVariantMap">
<value type="bool" key="EditorConfiguration.AutoIndent">true</value>
<value type="bool" key="EditorConfiguration.AutoSpacesForTabs">false</value>
<value type="bool" key="EditorConfiguration.CamelCaseNavigation">true</value>
<valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.0">
<value type="QByteArray" key="language">Cpp</value>
<valuemap type="QVariantMap" key="value">
<value type="QString" key="CurrentPreferences">CppGlobal</value>
</valuemap>
</valuemap>
<valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.1">
<value type="QByteArray" key="language">QmlJS</value>
<valuemap type="QVariantMap" key="value">
<value type="QString" key="CurrentPreferences">QmlJSGlobal</value>
</valuemap>
</valuemap>
<value type="int" key="EditorConfiguration.CodeStyle.Count">2</value>
<value type="QByteArray" key="EditorConfiguration.Codec">UTF-8</value>
<value type="bool" key="EditorConfiguration.ConstrainTooltips">false</value>
<value type="int" key="EditorConfiguration.IndentSize">4</value>
<value type="bool" key="EditorConfiguration.KeyboardTooltips">false</value>
<value type="bool" key="EditorConfiguration.MouseNavigation">true</value>
<value type="int" key="EditorConfiguration.PaddingMode">1</value>
<value type="bool" key="EditorConfiguration.ScrollWheelZooming">true</value>
<value type="int" key="EditorConfiguration.SmartBackspaceBehavior">0</value>
<value type="bool" key="EditorConfiguration.SpacesForTabs">true</value>
<value type="int" key="EditorConfiguration.TabKeyBehavior">0</value>
<value type="int" key="EditorConfiguration.TabSize">8</value>
<value type="bool" key="EditorConfiguration.UseGlobal">true</value>
<value type="int" key="EditorConfiguration.Utf8BomBehavior">1</value>
<value type="bool" key="EditorConfiguration.addFinalNewLine">true</value>
<value type="bool" key="EditorConfiguration.cleanIndentation">true</value>
<value type="bool" key="EditorConfiguration.cleanWhitespace">true</value>
<value type="bool" key="EditorConfiguration.inEntireDocument">false</value>
</valuemap>
</data>
<data>
<variable>ProjectExplorer.Project.PluginSettings</variable>
<valuemap type="QVariantMap"/>
</data>
<data>
<variable>ProjectExplorer.Project.Target.0</variable>
<valuemap type="QVariantMap">
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop</value>
<value type="QByteArray" key="ProjectExplorer.ProjectConfiguration.Id">{c0b898f4-d002-45f0-a6f8-01dc0bae760a}</value>
<value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value>
<value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
<value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">1</value>
<valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">
<value type="QString" key="CMakeProjectManager.CMakeBuildConfiguration.BuildDirectory">/home/dan/Projects/gtfw-build</value>
<value type="bool" key="CMakeProjectManager.CMakeBuildConfiguration.UseNinja">false</value>
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
<value type="QString" key="CMakeProjectManager.MakeStep.AdditionalArguments"></value>
<valuelist type="QVariantList" key="CMakeProjectManager.MakeStep.BuildTargets">
<value type="QString">all</value>
</valuelist>
<value type="bool" key="CMakeProjectManager.MakeStep.Clean">false</value>
<value type="bool" key="CMakeProjectManager.MakeStep.UseNinja">false</value>
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
<value type="QByteArray" key="ProjectExplorer.ProjectConfiguration.Id">CMakeProjectManager.MakeStep</value>
</valuemap>
<value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
<value type="QByteArray" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
</valuemap>
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
<value type="QString" key="CMakeProjectManager.MakeStep.AdditionalArguments">clean</value>
<valuelist type="QVariantList" key="CMakeProjectManager.MakeStep.BuildTargets"/>
<value type="bool" key="CMakeProjectManager.MakeStep.Clean">true</value>
<value type="bool" key="CMakeProjectManager.MakeStep.UseNinja">false</value>
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
<value type="QByteArray" key="ProjectExplorer.ProjectConfiguration.Id">CMakeProjectManager.MakeStep</value>
</valuemap>
<value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
<value type="QByteArray" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
</valuemap>
<value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
<value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
<valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">all</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
<value type="QByteArray" key="ProjectExplorer.ProjectConfiguration.Id">CMakeProjectManager.CMakeBuildConfiguration</value>
</valuemap>
<value type="int" key="ProjectExplorer.Target.BuildConfigurationCount">1</value>
<valuemap type="QVariantMap" key="ProjectExplorer.Target.DeployConfiguration.0">
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
<value type="int" key="ProjectExplorer.BuildStepList.StepsCount">0</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Deploy</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
<value type="QByteArray" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Deploy</value>
</valuemap>
<value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">1</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Deploy locally</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
<value type="QByteArray" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.DefaultDeployConfiguration</value>
</valuemap>
<value type="int" key="ProjectExplorer.Target.DeployConfigurationCount">1</value>
<valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.0">
<value type="bool" key="Analyzer.Project.UseGlobal">true</value>
<valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/>
<value type="bool" key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value>
<value type="bool" key="Analyzer.Valgrind.Callgrind.CollectSystime">false</value>
<value type="bool" key="Analyzer.Valgrind.Callgrind.EnableBranchSim">false</value>
<value type="bool" key="Analyzer.Valgrind.Callgrind.EnableCacheSim">false</value>
<value type="bool" key="Analyzer.Valgrind.Callgrind.EnableEventToolTips">true</value>
<value type="double" key="Analyzer.Valgrind.Callgrind.MinimumCostRatio">0.01</value>
<value type="double" key="Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio">10</value>
<value type="bool" key="Analyzer.Valgrind.FilterExternalIssues">true</value>
<value type="int" key="Analyzer.Valgrind.NumCallers">25</value>
<valuelist type="QVariantList" key="Analyzer.Valgrind.RemovedSuppressionFiles"/>
<value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value>
<value type="QString" key="Analyzer.Valgrind.ValgrindExecutable">valgrind</value>
<valuelist type="QVariantList" key="Analyzer.Valgrind.VisibleErrorKinds">
<value type="int">0</value>
<value type="int">1</value>
<value type="int">2</value>
<value type="int">3</value>
<value type="int">4</value>
<value type="int">5</value>
<value type="int">6</value>
<value type="int">7</value>
<value type="int">8</value>
<value type="int">9</value>
<value type="int">10</value>
<value type="int">11</value>
<value type="int">12</value>
<value type="int">13</value>
<value type="int">14</value>
</valuelist>
<value type="int" key="CMakeProjectManager.BaseEnvironmentBase">2</value>
<value type="QString" key="CMakeProjectManager.CMakeRunConfiguation.Title">datadump</value>
<value type="QString" key="CMakeProjectManager.CMakeRunConfiguration.Arguments">../viewer/GTA3/anim/ped.ifp</value>
<value type="bool" key="CMakeProjectManager.CMakeRunConfiguration.UseTerminal">false</value>
<valuelist type="QVariantList" key="CMakeProjectManager.CMakeRunConfiguration.UserEnvironmentChanges"/>
<value type="QString" key="CMakeProjectManager.CMakeRunConfiguration.UserWorkingDirectory"></value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">datadump</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
<value type="QByteArray" key="ProjectExplorer.ProjectConfiguration.Id">CMakeProjectManager.CMakeRunConfiguration.datadump</value>
<value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value>
<value type="bool" key="RunConfiguration.UseCppDebugger">true</value>
<value type="bool" key="RunConfiguration.UseMultiProcess">false</value>
<value type="bool" key="RunConfiguration.UseQmlDebugger">false</value>
<value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>
</valuemap>
<valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.1">
<value type="bool" key="Analyzer.Project.UseGlobal">true</value>
<valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/>
<value type="bool" key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value>
<value type="bool" key="Analyzer.Valgrind.Callgrind.CollectSystime">false</value>
<value type="bool" key="Analyzer.Valgrind.Callgrind.EnableBranchSim">false</value>
<value type="bool" key="Analyzer.Valgrind.Callgrind.EnableCacheSim">false</value>
<value type="bool" key="Analyzer.Valgrind.Callgrind.EnableEventToolTips">true</value>
<value type="double" key="Analyzer.Valgrind.Callgrind.MinimumCostRatio">0.01</value>
<value type="double" key="Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio">10</value>
<value type="bool" key="Analyzer.Valgrind.FilterExternalIssues">true</value>
<value type="int" key="Analyzer.Valgrind.NumCallers">25</value>
<valuelist type="QVariantList" key="Analyzer.Valgrind.RemovedSuppressionFiles"/>
<value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value>
<value type="QString" key="Analyzer.Valgrind.ValgrindExecutable">valgrind</value>
<valuelist type="QVariantList" key="Analyzer.Valgrind.VisibleErrorKinds">
<value type="int">0</value>
<value type="int">1</value>
<value type="int">2</value>
<value type="int">3</value>
<value type="int">4</value>
<value type="int">5</value>
<value type="int">6</value>
<value type="int">7</value>
<value type="int">8</value>
<value type="int">9</value>
<value type="int">10</value>
<value type="int">11</value>
<value type="int">12</value>
<value type="int">13</value>
<value type="int">14</value>
</valuelist>
<value type="int" key="CMakeProjectManager.BaseEnvironmentBase">2</value>
<value type="QString" key="CMakeProjectManager.CMakeRunConfiguation.Title">viewer</value>
<value type="QString" key="CMakeProjectManager.CMakeRunConfiguration.Arguments">GTA3 -w 1600 -h 900s</value>
<value type="bool" key="CMakeProjectManager.CMakeRunConfiguration.UseTerminal">false</value>
<valuelist type="QVariantList" key="CMakeProjectManager.CMakeRunConfiguration.UserEnvironmentChanges"/>
<value type="QString" key="CMakeProjectManager.CMakeRunConfiguration.UserWorkingDirectory"></value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">viewer</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
<value type="QByteArray" key="ProjectExplorer.ProjectConfiguration.Id">CMakeProjectManager.CMakeRunConfiguration.viewer</value>
<value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value>
<value type="bool" key="RunConfiguration.UseCppDebugger">true</value>
<value type="bool" key="RunConfiguration.UseMultiProcess">false</value>
<value type="bool" key="RunConfiguration.UseQmlDebugger">false</value>
<value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>
</valuemap>
<valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.2">
<value type="bool" key="Analyzer.Project.UseGlobal">true</value>
<valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/>
<value type="bool" key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value>
<value type="bool" key="Analyzer.Valgrind.Callgrind.CollectSystime">false</value>
<value type="bool" key="Analyzer.Valgrind.Callgrind.EnableBranchSim">false</value>
<value type="bool" key="Analyzer.Valgrind.Callgrind.EnableCacheSim">false</value>
<value type="bool" key="Analyzer.Valgrind.Callgrind.EnableEventToolTips">true</value>
<value type="double" key="Analyzer.Valgrind.Callgrind.MinimumCostRatio">0.01</value>
<value type="double" key="Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio">10</value>
<value type="bool" key="Analyzer.Valgrind.FilterExternalIssues">true</value>
<value type="int" key="Analyzer.Valgrind.NumCallers">25</value>
<valuelist type="QVariantList" key="Analyzer.Valgrind.RemovedSuppressionFiles"/>
<value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value>
<value type="QString" key="Analyzer.Valgrind.ValgrindExecutable">valgrind</value>
<valuelist type="QVariantList" key="Analyzer.Valgrind.VisibleErrorKinds">
<value type="int">0</value>
<value type="int">1</value>
<value type="int">2</value>
<value type="int">3</value>
<value type="int">4</value>
<value type="int">5</value>
<value type="int">6</value>
<value type="int">7</value>
<value type="int">8</value>
<value type="int">9</value>
<value type="int">10</value>
<value type="int">11</value>
<value type="int">12</value>
<value type="int">13</value>
<value type="int">14</value>
</valuelist>
<value type="int" key="CMakeProjectManager.BaseEnvironmentBase">2</value>
<value type="QString" key="CMakeProjectManager.CMakeRunConfiguation.Title">analyzer</value>
<value type="QString" key="CMakeProjectManager.CMakeRunConfiguration.Arguments"></value>
<value type="bool" key="CMakeProjectManager.CMakeRunConfiguration.UseTerminal">false</value>
<valuelist type="QVariantList" key="CMakeProjectManager.CMakeRunConfiguration.UserEnvironmentChanges"/>
<value type="QString" key="CMakeProjectManager.CMakeRunConfiguration.UserWorkingDirectory"></value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">analyzer</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
<value type="QByteArray" key="ProjectExplorer.ProjectConfiguration.Id">CMakeProjectManager.CMakeRunConfiguration.analyzer</value>
<value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value>
<value type="bool" key="RunConfiguration.UseCppDebugger">true</value>
<value type="bool" key="RunConfiguration.UseMultiProcess">false</value>
<value type="bool" key="RunConfiguration.UseQmlDebugger">false</value>
<value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>
</valuemap>
<valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.3">
<value type="bool" key="Analyzer.Project.UseGlobal">true</value>
<valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/>
<value type="bool" key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value>
<value type="bool" key="Analyzer.Valgrind.Callgrind.CollectSystime">false</value>
<value type="bool" key="Analyzer.Valgrind.Callgrind.EnableBranchSim">false</value>
<value type="bool" key="Analyzer.Valgrind.Callgrind.EnableCacheSim">false</value>
<value type="bool" key="Analyzer.Valgrind.Callgrind.EnableEventToolTips">true</value>
<value type="double" key="Analyzer.Valgrind.Callgrind.MinimumCostRatio">0.01</value>
<value type="double" key="Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio">10</value>
<value type="bool" key="Analyzer.Valgrind.FilterExternalIssues">true</value>
<value type="int" key="Analyzer.Valgrind.NumCallers">25</value>
<valuelist type="QVariantList" key="Analyzer.Valgrind.RemovedSuppressionFiles"/>
<value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value>
<value type="QString" key="Analyzer.Valgrind.ValgrindExecutable">valgrind</value>
<valuelist type="QVariantList" key="Analyzer.Valgrind.VisibleErrorKinds">
<value type="int">0</value>
<value type="int">1</value>
<value type="int">2</value>
<value type="int">3</value>
<value type="int">4</value>
<value type="int">5</value>
<value type="int">6</value>
<value type="int">7</value>
<value type="int">8</value>
<value type="int">9</value>
<value type="int">10</value>
<value type="int">11</value>
<value type="int">12</value>
<value type="int">13</value>
<value type="int">14</value>
</valuelist>
<value type="int" key="CMakeProjectManager.BaseEnvironmentBase">2</value>
<value type="QString" key="CMakeProjectManager.CMakeRunConfiguation.Title">run_tests</value>
<value type="QString" key="CMakeProjectManager.CMakeRunConfiguration.Arguments"></value>
<value type="bool" key="CMakeProjectManager.CMakeRunConfiguration.UseTerminal">false</value>
<valuelist type="QVariantList" key="CMakeProjectManager.CMakeRunConfiguration.UserEnvironmentChanges"/>
<value type="QString" key="CMakeProjectManager.CMakeRunConfiguration.UserWorkingDirectory"></value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">run_tests</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
<value type="QByteArray" key="ProjectExplorer.ProjectConfiguration.Id">CMakeProjectManager.CMakeRunConfiguration.run_tests</value>
<value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value>
<value type="bool" key="RunConfiguration.UseCppDebugger">true</value>
<value type="bool" key="RunConfiguration.UseMultiProcess">false</value>
<value type="bool" key="RunConfiguration.UseQmlDebugger">false</value>
<value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>
</valuemap>
<value type="int" key="ProjectExplorer.Target.RunConfigurationCount">4</value>
</valuemap>
</data>
<data>
<variable>ProjectExplorer.Project.TargetCount</variable>
<value type="int">1</value>
</data>
<data>
<variable>ProjectExplorer.Project.Updater.EnvironmentId</variable>
<value type="QString">{1548d26f-0c52-4512-96d9-d63208a0e241}</value>
</data>
<data>
<variable>ProjectExplorer.Project.Updater.FileVersion</variable>
<value type="int">12</value>
</data>
</qtcreator>

4
analyzer/CMakeLists.txt
View File

@ -1,7 +1,7 @@
add_executable(analyzer main.cpp)
include_directories(../framework2/include)
include_directories(../rwengine/include)
target_link_libraries( analyzer renderware sfml-graphics )
target_link_libraries( analyzer rwengine sfml-graphics )
install(TARGETS analyzer RUNTIME DESTINATION bin)

4
datadump/CMakeLists.txt
View File

@ -1,5 +1,5 @@
add_executable(datadump main.cpp)
include_directories(../framework2/include)
target_link_libraries( datadump renderware )
include_directories(../rwengine/include)
target_link_libraries( datadump rwengine )
install(TARGETS datadump RUNTIME DESTINATION bin)

7
game/CMakeLists.txt
View File

@ -1,7 +0,0 @@
add_executable(game main.cpp)
include_directories(../framework2/include /usr/include/bullet)
target_link_libraries(game renderware sfml-graphics sfml-window sfml-system GL GLEW BulletDynamics BulletCollision LinearMath )
install(TARGETS game RUNTIME DESTINATION bin)

4
framework2/CMakeLists.txt → rwengine/CMakeLists.txt
View File

@ -5,11 +5,11 @@ source_group("Header Files" FILES ${RENDERWARE_HEADERS})
source_group("Source Files" FILES ${RENDERWARE_SOURCES})
add_library(renderware
add_library(rwengine
${RENDERWARE_SOURCES}
${RENDERWARE_HEADERS}
)
target_link_libraries(renderware sfml-window GLEW)
target_link_libraries(rwengine sfml-window GLEW)
include_directories(include /usr/include/bullet)

0
framework2/include/BinaryStream.hpp → rwengine/include/BinaryStream.hpp
View File

0
framework2/include/TextureArchive.hpp → rwengine/include/TextureArchive.hpp
View File

0
framework2/include/ai/AIGraph.hpp → rwengine/include/ai/AIGraph.hpp
View File

0
framework2/include/ai/GTAAIController.hpp → rwengine/include/ai/GTAAIController.hpp
View File

0
framework2/include/ai/GTAAINode.hpp → rwengine/include/ai/GTAAINode.hpp
View File

0
framework2/include/ai/GTADefaultAIController.hpp → rwengine/include/ai/GTADefaultAIController.hpp
View File

0
framework2/include/ai/GTAPlayerAIController.hpp → rwengine/include/ai/GTAPlayerAIController.hpp
View File

0
framework2/include/data/CollisionModel.hpp → rwengine/include/data/CollisionModel.hpp
View File

0
framework2/include/data/InstanceData.hpp → rwengine/include/data/InstanceData.hpp
View File

0
framework2/include/data/ObjectData.hpp → rwengine/include/data/ObjectData.hpp
View File

0
framework2/include/data/PathData.hpp → rwengine/include/data/PathData.hpp
View File

0
framework2/include/engine/Animator.hpp → rwengine/include/engine/Animator.hpp
View File

0
framework2/include/engine/GTAObject.hpp → rwengine/include/engine/GTAObject.hpp
View File

0
framework2/include/engine/GTATypes.hpp → rwengine/include/engine/GTATypes.hpp
View File

0
framework2/include/engine/GameData.hpp → rwengine/include/engine/GameData.hpp
View File

0
framework2/include/engine/GameWorld.hpp → rwengine/include/engine/GameWorld.hpp
View File

0
framework2/include/loaders/LoaderCOL.hpp → rwengine/include/loaders/LoaderCOL.hpp
View File

0
framework2/include/loaders/LoaderDFF.hpp → rwengine/include/loaders/LoaderDFF.hpp
View File

0
framework2/include/loaders/LoaderIDE.hpp → rwengine/include/loaders/LoaderIDE.hpp
View File

0
framework2/include/loaders/LoaderIFP.hpp → rwengine/include/loaders/LoaderIFP.hpp
View File

0
framework2/include/loaders/LoaderIMG.hpp → rwengine/include/loaders/LoaderIMG.hpp
View File

0
framework2/include/loaders/LoaderIPL.hpp → rwengine/include/loaders/LoaderIPL.hpp
View File

0
framework2/include/loaders/TextureLoader.hpp → rwengine/include/loaders/TextureLoader.hpp
View File

0
framework2/include/loaders/WeatherLoader.hpp → rwengine/include/loaders/WeatherLoader.hpp
View File

0
framework2/include/loaders/rwbinarystream.h → rwengine/include/loaders/rwbinarystream.h
View File

0
framework2/include/objects/GTACharacter.hpp → rwengine/include/objects/GTACharacter.hpp
View File

0
framework2/include/objects/GTAInstance.hpp → rwengine/include/objects/GTAInstance.hpp
View File

0
framework2/include/objects/GTAVehicle.hpp → rwengine/include/objects/GTAVehicle.hpp
View File

0
framework2/include/objects/VehicleInfo.hpp → rwengine/include/objects/VehicleInfo.hpp
View File

0
framework2/include/render/DebugDraw.hpp → rwengine/include/render/DebugDraw.hpp
View File

0
framework2/include/render/GTARenderer.hpp → rwengine/include/render/GTARenderer.hpp
View File

0
framework2/include/render/Model.hpp → rwengine/include/render/Model.hpp
View File

0
framework2/include/render/TextureAtlas.hpp → rwengine/include/render/TextureAtlas.hpp
View File

0
framework2/include/render/ViewCamera.hpp → rwengine/include/render/ViewCamera.hpp
View File

0
framework2/include/render/ViewFrustum.hpp → rwengine/include/render/ViewFrustum.hpp
View File

0
framework2/src/BinaryStream.cpp → rwengine/src/BinaryStream.cpp
View File

0
framework2/src/TextureArchive.cpp → rwengine/src/TextureArchive.cpp
View File

0
framework2/src/ai/AIGraph.cpp → rwengine/src/ai/AIGraph.cpp
View File

0
framework2/src/ai/GTAAIController.cpp → rwengine/src/ai/GTAAIController.cpp
View File

0
framework2/src/ai/GTAAINode.cpp → rwengine/src/ai/GTAAINode.cpp
View File

0
framework2/src/ai/GTADefaultAIController.cpp → rwengine/src/ai/GTADefaultAIController.cpp
View File

0
framework2/src/ai/GTAPlayerAIController.cpp → rwengine/src/ai/GTAPlayerAIController.cpp
View File

0
framework2/src/engine/Animator.cpp → rwengine/src/engine/Animator.cpp
View File

0
framework2/src/engine/GTAObject.cpp → rwengine/src/engine/GTAObject.cpp
View File

0
framework2/src/engine/GameData.cpp → rwengine/src/engine/GameData.cpp
View File

0
framework2/src/engine/GameWorld.cpp → rwengine/src/engine/GameWorld.cpp
View File

0
framework2/src/loaders/LoaderCOL.cpp → rwengine/src/loaders/LoaderCOL.cpp
View File

0
framework2/src/loaders/LoaderDFF.cpp → rwengine/src/loaders/LoaderDFF.cpp
View File

0
framework2/src/loaders/LoaderIDE.cpp → rwengine/src/loaders/LoaderIDE.cpp
View File

0
framework2/src/loaders/LoaderIFP.cpp → rwengine/src/loaders/LoaderIFP.cpp
View File

0
framework2/src/loaders/LoaderIMG.cpp → rwengine/src/loaders/LoaderIMG.cpp
View File

0
framework2/src/loaders/LoaderIPL.cpp → rwengine/src/loaders/LoaderIPL.cpp
View File

0
framework2/src/loaders/TextureLoader.cpp → rwengine/src/loaders/TextureLoader.cpp
View File

0
framework2/src/loaders/WeatherLoader.cpp → rwengine/src/loaders/WeatherLoader.cpp
View File

0
framework2/src/objects/GTACharacter.cpp → rwengine/src/objects/GTACharacter.cpp
View File

0
framework2/src/objects/GTAInstance.cpp → rwengine/src/objects/GTAInstance.cpp
View File

0
framework2/src/objects/GTAVehicle.cpp → rwengine/src/objects/GTAVehicle.cpp
View File

0
framework2/src/render/DebugDraw.cpp → rwengine/src/render/DebugDraw.cpp
View File

0
framework2/src/render/GTARenderer.cpp → rwengine/src/render/GTARenderer.cpp
View File

0
framework2/src/render/Model.cpp → rwengine/src/render/Model.cpp
View File

0
framework2/src/render/TextureAtlas.cpp → rwengine/src/render/TextureAtlas.cpp
View File

7
rwgame/CMakeLists.txt Normal file
View File

@ -0,0 +1,7 @@
add_executable(rwgame main.cpp)
include_directories(../rwengine/include /usr/include/bullet)
target_link_libraries( rwgame rwengine sfml-graphics sfml-window sfml-system GL GLEW BulletDynamics BulletCollision LinearMath )
install(TARGETS rwgame RUNTIME DESTINATION bin)

0
viewer/MenuSystem.hpp → rwgame/MenuSystem.hpp
View File

0
viewer/State.hpp → rwgame/State.hpp
View File

0
viewer/main.cpp → rwgame/main.cpp
View File

7
rwviewer/CMakeLists.txt Normal file
View File

@ -0,0 +1,7 @@
add_executable(rwviewer main.cpp)
include_directories(../rwengine/include /usr/include/bullet)
target_link_libraries(rwviewer rwengine sfml-graphics sfml-window sfml-system GL GLEW BulletDynamics BulletCollision LinearMath )
install(TARGETS rwviewer RUNTIME DESTINATION bin)

0
game/main.cpp → rwviewer/main.cpp
View File

5
tests/CMakeLists.txt
View File

@ -1,4 +1,3 @@
FILE(GLOB TEST_SOURCES "*.cpp")
ADD_DEFINITIONS(-DBOOST_TEST_DYN_LINK)
@ -8,8 +7,8 @@ include_directories(include)
find_package(Boost COMPONENTS unit_test_framework REQUIRED)
include_directories(../framework2/include ../viewer /usr/include/bullet)
include_directories(../rwengine/include ../rwgame /usr/include/bullet)
target_link_libraries(run_tests renderware sfml-window sfml-system sfml-graphics GL GLEW BulletDynamics BulletCollision LinearMath ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
target_link_libraries(run_tests rwengine sfml-window sfml-system sfml-graphics GL GLEW BulletDynamics BulletCollision LinearMath ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
add_test(UnitTests run_tests)

7
viewer/CMakeLists.txt
View File

@ -1,7 +0,0 @@
add_executable(viewer main.cpp)
include_directories(../framework2/include /usr/include/bullet)
target_link_libraries( viewer renderware sfml-graphics sfml-window sfml-system GL GLEW BulletDynamics BulletCollision LinearMath )
install(TARGETS viewer RUNTIME DESTINATION bin)