mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-02-01 03:05:24 +01:00
Code Issues Releases Wiki Activity

Change folder structure

Browse Source
This commit is contained in:
Marijn van der Werf
2016-09-05 23:41:42 +02:00
parent 5f62443686
commit df202d86a6
9 changed files with 43 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
CMakeLists.txt
View File

@@ -368,11 +368,11 @@ install(FILES ${DOC_FILES} DESTINATION share/doc/${PROJECT})
file(GLOB_RECURSE ORCT2_RIDE_SOURCES "src/ride/*/*.c")
file(GLOB_RECURSE ORCT2_RIDE_DEP_SOURCES "src/ride/ride_data.c" "src/ride/track_data.c" "src/ride/track_paint.c" "src/addresses.c" "src/diagnostic.c" "src/hook.c" "src/paint/map_element/map_element.c")
file(GLOB_RECURSE ORCT2_PAINT_TEST_SOURCES "PaintTest/*.c" "PaintTest/*.cpp" "PaintTest/*.h")
file(GLOB_RECURSE ORCT2_PAINT_TEST_SOURCES "test/testpaint/*.c" "test/testpaint/*.cpp" "test/testpaint/*.h")
add_executable(test-paint EXCLUDE_FROM_ALL ${ORCT2_RIDE_SOURCES} ${ORCT2_RIDE_DEP_SOURCES} ${ORCT2_PAINT_TEST_SOURCES})
set_target_properties(test-paint PROPERTIES COMPILE_FLAGS "-DNO_VEHICLES")
add_dependencies(test-paint segfiles)
add_executable(testpaint EXCLUDE_FROM_ALL ${ORCT2_RIDE_SOURCES} ${ORCT2_RIDE_DEP_SOURCES} ${ORCT2_PAINT_TEST_SOURCES})
set_target_properties(testpaint PROPERTIES COMPILE_FLAGS "-DNO_VEHICLES")
add_dependencies(testpaint segfiles)
set(CPACK_PACKAGE_VERSION_MAJOR 0)
set(CPACK_PACKAGE_VERSION_MINOR 0)

15
OpenRCT2.xcodeproj/project.pbxproj
View File

@@ -1151,7 +1151,15 @@
/* End PBXFrameworksBuildPhase section */
/* Begin PBXGroup section */
C64FDA5E1D6D99F400F259B9 /* PaintTest */ = {
8546F74A1D7E1D220004004C /* Tests */ = {
isa = PBXGroup;
children = (
C64FDA5E1D6D99F400F259B9 /* Paint */,
);
name = Tests;
sourceTree = "<group>";
};
C64FDA5E1D6D99F400F259B9 /* Paint */ = {
isa = PBXGroup;
children = (
C64FDAC41D6DA55E00F259B9 /* compat.c */,
@@ -1161,7 +1169,8 @@
85AFA2101D7DB83E00221B42 /* intercept.h */,
85AFA20F1D7DB83E00221B42 /* main.cpp */,
);
path = PaintTest;
name = Paint;
path = test/testpaint;
sourceTree = "<group>";
};
C650B2141CCABBDD00B4D91C /* rct1 */ = {
@@ -2062,8 +2071,8 @@
children = (
D41B72431C21015A0080A7B9 /* Sources */,
D497D07A1C20FD52002BF46A /* Resources */,
8546F74A1D7E1D220004004C /* Tests */,
D41B73ED1C21017D0080A7B9 /* Libraries */,
C64FDA5E1D6D99F400F259B9 /* PaintTest */,
D497D0791C20FD52002BF46A /* Products */,
);
sourceTree = "<group>";

12
PaintUnitTest.vcxproj
View File

@@ -117,14 +117,14 @@
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ClInclude Include="PaintTest\data.h" />
<ClInclude Include="PaintTest\intercept.h" />
<ClInclude Include="test\testpaint\data.h" />
<ClInclude Include="test\testpaint\intercept.h" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="PaintTest\compat.c" />
<ClCompile Include="PaintTest\data.c" />
<ClCompile Include="PaintTest\intercept.c" />
<ClCompile Include="PaintTest\main.cpp" />
<ClCompile Include="test\testpaint\compat.c" />
<ClCompile Include="test\testpaint\data.c" />
<ClCompile Include="test\testpaint\intercept.c" />
<ClCompile Include="test\testpaint\main.cpp" />
<ClCompile Include="src\addresses.c" />
<ClCompile Include="src\diagnostic.c" />
<ClCompile Include="src\hook.c" />

16
PaintTest/compat.c → test/testpaint/compat.c
View File

@@ -14,14 +14,14 @@
*****************************************************************************/
#pragma endregion
#include "../src/config.h"
#include "../src/object.h"
#include "../src/interface/colour.h"
#include "../src/interface/viewport.h"
#include "../src/ride/ride.h"
#include "../src/ride/track.h"
#include "../src/world/sprite.h"
#include "../src/paint/map_element/map_element.h"
#include "../../src/config.h"
#include "../../src/object.h"
#include "../../src/interface/colour.h"
#include "../../src/interface/viewport.h"
#include "../../src/ride/ride.h"
#include "../../src/ride/track.h"
#include "../../src/world/sprite.h"
#include "../../src/paint/map_element/map_element.h"
#define gRideEntries RCT2_ADDRESS(RCT2_ADDRESS_RIDE_ENTRIES, rct_ride_entry*)
#define gCurrentRotation RCT2_GLOBAL(RCT2_ADDRESS_CURRENT_ROTATION, uint8)

2
PaintTest/data.c → test/testpaint/data.c
View File

@@ -14,7 +14,7 @@
*****************************************************************************/
#pragma endregion
#include "../src/common.h"
#include "../../src/common.h"
const utf8string RideNames[91] = {
"SpiralRollerCoaster",

2
PaintTest/data.h → test/testpaint/data.h
View File

@@ -17,7 +17,7 @@
#ifndef _TEST_PAINT_DATA_H_
#define _TEST_PAINT_DATA_H_
#include "../src/common.h"
#include "../../src/common.h"
extern const utf8string RideNames[91];
extern const utf8string TrackNames[256];

10
PaintTest/intercept.c → test/testpaint/intercept.c
View File

@@ -15,11 +15,11 @@
#pragma endregion
#include "intercept.h"
#include "../src/paint/paint.h"
#include "../src/paint/supports.h"
#include "../src/ride/track_data.h"
#include "../src/interface/viewport.h"
#include "../src/hook.h"
#include "../../src/paint/paint.h"
#include "../../src/paint/supports.h"
#include "../../src/ride/track_data.h"
#include "../../src/interface/viewport.h"
#include "../../src/hook.h"
#define gRideEntries RCT2_ADDRESS(RCT2_ADDRESS_RIDE_ENTRIES, rct_ride_entry*)
#define gCurrentRotation RCT2_GLOBAL(RCT2_ADDRESS_CURRENT_ROTATION, uint8)

2
PaintTest/intercept.h → test/testpaint/intercept.h
View File

@@ -17,7 +17,7 @@
#ifndef _TEST_PAINT_INTERCEPT_H_
#define _TEST_PAINT_INTERCEPT_H_
#include "../src/common.h"
#include "../../src/common.h"
bool testRide(int rideType);
void initHooks();

10
PaintTest/main.cpp → test/testpaint/main.cpp
View File

@@ -21,11 +21,11 @@
extern "C" {
#include "data.h"
#include "intercept.h"
#include "../src/rct2.h"
#include "../src/ride/ride.h"
#include "../src/ride/ride_data.h"
#include "../src/ride/track.h"
#include "../src/ride/track_data.h"
#include "../../src/rct2.h"
#include "../../src/ride/ride.h"
#include "../../src/ride/ride_data.h"
#include "../../src/ride/track.h"
#include "../../src/ride/track_data.h"
}
typedef struct {