fix Vanilla and codewarrior build

This commit is contained in:
withmorten
2021-09-09 17:23:58 +02:00
parent 6fbea86ba6
commit 0d9c0aca0c
2 changed files with 36 additions and 68 deletions
+35 -65
View File
@@ -1879,7 +1879,7 @@
</FILE> </FILE>
<FILE> <FILE>
<PATHTYPE>Name</PATHTYPE> <PATHTYPE>Name</PATHTYPE>
<PATH>CdStream.cpp</PATH> <PATH>CdStream_win.cpp</PATH>
<PATHFORMAT>Windows</PATHFORMAT> <PATHFORMAT>Windows</PATHFORMAT>
<FILEKIND>Text</FILEKIND> <FILEKIND>Text</FILEKIND>
<FILEFLAGS>Debug</FILEFLAGS> <FILEFLAGS>Debug</FILEFLAGS>
@@ -1891,13 +1891,6 @@
<FILEKIND>Text</FILEKIND> <FILEKIND>Text</FILEKIND>
<FILEFLAGS></FILEFLAGS> <FILEFLAGS></FILEFLAGS>
</FILE> </FILE>
<FILE>
<PATHTYPE>Name</PATHTYPE>
<PATH>CdStreamPosix.cpp</PATH>
<PATHFORMAT>Windows</PATHFORMAT>
<FILEKIND>Text</FILEKIND>
<FILEFLAGS>Debug</FILEFLAGS>
</FILE>
<FILE> <FILE>
<PATHTYPE>Name</PATHTYPE> <PATHTYPE>Name</PATHTYPE>
<PATH>Clock.cpp</PATH> <PATH>Clock.cpp</PATH>
@@ -2521,13 +2514,6 @@
<FILEKIND>Text</FILEKIND> <FILEKIND>Text</FILEKIND>
<FILEFLAGS></FILEFLAGS> <FILEFLAGS></FILEFLAGS>
</FILE> </FILE>
<FILE>
<PATHTYPE>Name</PATHTYPE>
<PATH>math.cpp</PATH>
<PATHFORMAT>Windows</PATHFORMAT>
<FILEKIND>Text</FILEKIND>
<FILEFLAGS>Debug</FILEFLAGS>
</FILE>
<FILE> <FILE>
<PATHTYPE>Name</PATHTYPE> <PATHTYPE>Name</PATHTYPE>
<PATH>maths.h</PATH> <PATH>maths.h</PATH>
@@ -2598,6 +2584,13 @@
<FILEKIND>Text</FILEKIND> <FILEKIND>Text</FILEKIND>
<FILEFLAGS></FILEFLAGS> <FILEFLAGS></FILEFLAGS>
</FILE> </FILE>
<FILE>
<PATHTYPE>Name</PATHTYPE>
<PATH>VuVector.cpp</PATH>
<PATHFORMAT>Windows</PATHFORMAT>
<FILEKIND>Text</FILEKIND>
<FILEFLAGS>Debug</FILEFLAGS>
</FILE>
<FILE> <FILE>
<PATHTYPE>Name</PATHTYPE> <PATHTYPE>Name</PATHTYPE>
<PATH>VuVector.h</PATH> <PATH>VuVector.h</PATH>
@@ -4830,7 +4823,7 @@
</FILEREF> </FILEREF>
<FILEREF> <FILEREF>
<PATHTYPE>Name</PATHTYPE> <PATHTYPE>Name</PATHTYPE>
<PATH>CdStream.cpp</PATH> <PATH>CdStream_win.cpp</PATH>
<PATHFORMAT>Windows</PATHFORMAT> <PATHFORMAT>Windows</PATHFORMAT>
</FILEREF> </FILEREF>
<FILEREF> <FILEREF>
@@ -4838,11 +4831,6 @@
<PATH>CdStream.h</PATH> <PATH>CdStream.h</PATH>
<PATHFORMAT>Windows</PATHFORMAT> <PATHFORMAT>Windows</PATHFORMAT>
</FILEREF> </FILEREF>
<FILEREF>
<PATHTYPE>Name</PATHTYPE>
<PATH>CdStreamPosix.cpp</PATH>
<PATHFORMAT>Windows</PATHFORMAT>
</FILEREF>
<FILEREF> <FILEREF>
<PATHTYPE>Name</PATHTYPE> <PATHTYPE>Name</PATHTYPE>
<PATH>Clock.cpp</PATH> <PATH>Clock.cpp</PATH>
@@ -5288,11 +5276,6 @@
<PATH>Physical.h</PATH> <PATH>Physical.h</PATH>
<PATHFORMAT>Windows</PATHFORMAT> <PATHFORMAT>Windows</PATHFORMAT>
</FILEREF> </FILEREF>
<FILEREF>
<PATHTYPE>Name</PATHTYPE>
<PATH>math.cpp</PATH>
<PATHFORMAT>Windows</PATHFORMAT>
</FILEREF>
<FILEREF> <FILEREF>
<PATHTYPE>Name</PATHTYPE> <PATHTYPE>Name</PATHTYPE>
<PATH>maths.h</PATH> <PATH>maths.h</PATH>
@@ -5343,6 +5326,11 @@
<PATH>Vector2D.h</PATH> <PATH>Vector2D.h</PATH>
<PATHFORMAT>Windows</PATHFORMAT> <PATHFORMAT>Windows</PATHFORMAT>
</FILEREF> </FILEREF>
<FILEREF>
<PATHTYPE>Name</PATHTYPE>
<PATH>VuVector.cpp</PATH>
<PATHFORMAT>Windows</PATHFORMAT>
</FILEREF>
<FILEREF> <FILEREF>
<PATHTYPE>Name</PATHTYPE> <PATHTYPE>Name</PATHTYPE>
<PATH>VuVector.h</PATH> <PATH>VuVector.h</PATH>
@@ -8416,7 +8404,7 @@
</FILE> </FILE>
<FILE> <FILE>
<PATHTYPE>Name</PATHTYPE> <PATHTYPE>Name</PATHTYPE>
<PATH>CdStream.cpp</PATH> <PATH>CdStream_win.cpp</PATH>
<PATHFORMAT>Windows</PATHFORMAT> <PATHFORMAT>Windows</PATHFORMAT>
<FILEKIND>Text</FILEKIND> <FILEKIND>Text</FILEKIND>
<FILEFLAGS>Debug</FILEFLAGS> <FILEFLAGS>Debug</FILEFLAGS>
@@ -8428,13 +8416,6 @@
<FILEKIND>Text</FILEKIND> <FILEKIND>Text</FILEKIND>
<FILEFLAGS></FILEFLAGS> <FILEFLAGS></FILEFLAGS>
</FILE> </FILE>
<FILE>
<PATHTYPE>Name</PATHTYPE>
<PATH>CdStreamPosix.cpp</PATH>
<PATHFORMAT>Windows</PATHFORMAT>
<FILEKIND>Text</FILEKIND>
<FILEFLAGS>Debug</FILEFLAGS>
</FILE>
<FILE> <FILE>
<PATHTYPE>Name</PATHTYPE> <PATHTYPE>Name</PATHTYPE>
<PATH>Clock.cpp</PATH> <PATH>Clock.cpp</PATH>
@@ -9058,13 +9039,6 @@
<FILEKIND>Text</FILEKIND> <FILEKIND>Text</FILEKIND>
<FILEFLAGS></FILEFLAGS> <FILEFLAGS></FILEFLAGS>
</FILE> </FILE>
<FILE>
<PATHTYPE>Name</PATHTYPE>
<PATH>math.cpp</PATH>
<PATHFORMAT>Windows</PATHFORMAT>
<FILEKIND>Text</FILEKIND>
<FILEFLAGS>Debug</FILEFLAGS>
</FILE>
<FILE> <FILE>
<PATHTYPE>Name</PATHTYPE> <PATHTYPE>Name</PATHTYPE>
<PATH>maths.h</PATH> <PATH>maths.h</PATH>
@@ -9135,6 +9109,13 @@
<FILEKIND>Text</FILEKIND> <FILEKIND>Text</FILEKIND>
<FILEFLAGS></FILEFLAGS> <FILEFLAGS></FILEFLAGS>
</FILE> </FILE>
<FILE>
<PATHTYPE>Name</PATHTYPE>
<PATH>VuVector.cpp</PATH>
<PATHFORMAT>Windows</PATHFORMAT>
<FILEKIND>Text</FILEKIND>
<FILEFLAGS>Debug</FILEFLAGS>
</FILE>
<FILE> <FILE>
<PATHTYPE>Name</PATHTYPE> <PATHTYPE>Name</PATHTYPE>
<PATH>VuVector.h</PATH> <PATH>VuVector.h</PATH>
@@ -11367,7 +11348,7 @@
</FILEREF> </FILEREF>
<FILEREF> <FILEREF>
<PATHTYPE>Name</PATHTYPE> <PATHTYPE>Name</PATHTYPE>
<PATH>CdStream.cpp</PATH> <PATH>CdStream_win.cpp</PATH>
<PATHFORMAT>Windows</PATHFORMAT> <PATHFORMAT>Windows</PATHFORMAT>
</FILEREF> </FILEREF>
<FILEREF> <FILEREF>
@@ -11375,11 +11356,6 @@
<PATH>CdStream.h</PATH> <PATH>CdStream.h</PATH>
<PATHFORMAT>Windows</PATHFORMAT> <PATHFORMAT>Windows</PATHFORMAT>
</FILEREF> </FILEREF>
<FILEREF>
<PATHTYPE>Name</PATHTYPE>
<PATH>CdStreamPosix.cpp</PATH>
<PATHFORMAT>Windows</PATHFORMAT>
</FILEREF>
<FILEREF> <FILEREF>
<PATHTYPE>Name</PATHTYPE> <PATHTYPE>Name</PATHTYPE>
<PATH>Clock.cpp</PATH> <PATH>Clock.cpp</PATH>
@@ -11825,11 +11801,6 @@
<PATH>Physical.h</PATH> <PATH>Physical.h</PATH>
<PATHFORMAT>Windows</PATHFORMAT> <PATHFORMAT>Windows</PATHFORMAT>
</FILEREF> </FILEREF>
<FILEREF>
<PATHTYPE>Name</PATHTYPE>
<PATH>math.cpp</PATH>
<PATHFORMAT>Windows</PATHFORMAT>
</FILEREF>
<FILEREF> <FILEREF>
<PATHTYPE>Name</PATHTYPE> <PATHTYPE>Name</PATHTYPE>
<PATH>maths.h</PATH> <PATH>maths.h</PATH>
@@ -11880,6 +11851,11 @@
<PATH>Vector2D.h</PATH> <PATH>Vector2D.h</PATH>
<PATHFORMAT>Windows</PATHFORMAT> <PATHFORMAT>Windows</PATHFORMAT>
</FILEREF> </FILEREF>
<FILEREF>
<PATHTYPE>Name</PATHTYPE>
<PATH>VuVector.cpp</PATH>
<PATHFORMAT>Windows</PATHFORMAT>
</FILEREF>
<FILEREF> <FILEREF>
<PATHTYPE>Name</PATHTYPE> <PATHTYPE>Name</PATHTYPE>
<PATH>VuVector.h</PATH> <PATH>VuVector.h</PATH>
@@ -13941,7 +13917,7 @@
<FILEREF> <FILEREF>
<TARGETNAME>Debug</TARGETNAME> <TARGETNAME>Debug</TARGETNAME>
<PATHTYPE>Name</PATHTYPE> <PATHTYPE>Name</PATHTYPE>
<PATH>CdStream.cpp</PATH> <PATH>CdStream_win.cpp</PATH>
<PATHFORMAT>Windows</PATHFORMAT> <PATHFORMAT>Windows</PATHFORMAT>
</FILEREF> </FILEREF>
<FILEREF> <FILEREF>
@@ -13950,12 +13926,6 @@
<PATH>CdStream.h</PATH> <PATH>CdStream.h</PATH>
<PATHFORMAT>Windows</PATHFORMAT> <PATHFORMAT>Windows</PATHFORMAT>
</FILEREF> </FILEREF>
<FILEREF>
<TARGETNAME>Debug</TARGETNAME>
<PATHTYPE>Name</PATHTYPE>
<PATH>CdStreamPosix.cpp</PATH>
<PATHFORMAT>Windows</PATHFORMAT>
</FILEREF>
<FILEREF> <FILEREF>
<TARGETNAME>Debug</TARGETNAME> <TARGETNAME>Debug</TARGETNAME>
<PATHTYPE>Name</PATHTYPE> <PATHTYPE>Name</PATHTYPE>
@@ -14494,12 +14464,6 @@
</FILEREF> </FILEREF>
</GROUP> </GROUP>
<GROUP><NAME>math</NAME> <GROUP><NAME>math</NAME>
<FILEREF>
<TARGETNAME>Debug</TARGETNAME>
<PATHTYPE>Name</PATHTYPE>
<PATH>math.cpp</PATH>
<PATHFORMAT>Windows</PATHFORMAT>
</FILEREF>
<FILEREF> <FILEREF>
<TARGETNAME>Debug</TARGETNAME> <TARGETNAME>Debug</TARGETNAME>
<PATHTYPE>Name</PATHTYPE> <PATHTYPE>Name</PATHTYPE>
@@ -14560,6 +14524,12 @@
<PATH>Vector2D.h</PATH> <PATH>Vector2D.h</PATH>
<PATHFORMAT>Windows</PATHFORMAT> <PATHFORMAT>Windows</PATHFORMAT>
</FILEREF> </FILEREF>
<FILEREF>
<TARGETNAME>Debug</TARGETNAME>
<PATHTYPE>Name</PATHTYPE>
<PATH>VuVector.cpp</PATH>
<PATHFORMAT>Windows</PATHFORMAT>
</FILEREF>
<FILEREF> <FILEREF>
<TARGETNAME>Debug</TARGETNAME> <TARGETNAME>Debug</TARGETNAME>
<PATHTYPE>Name</PATHTYPE> <PATHTYPE>Name</PATHTYPE>
+1 -3
View File
@@ -189,6 +189,7 @@ enum Config {
# define GTA_SCENE_EDIT # define GTA_SCENE_EDIT
# define PC_MENU # define PC_MENU
# define PC_WATER # define PC_WATER
# define GTA_PC_CONTROLS // enables keyboard and mouse. currently GTA_PC and a few other defines will not work without this
#elif defined GTA_XBOX #elif defined GTA_XBOX
#elif defined GTA_MOBILE #elif defined GTA_MOBILE
# define MISSION_REPLAY # define MISSION_REPLAY
@@ -351,9 +352,6 @@ enum Config {
#define REGISTER_START_BUTTON #define REGISTER_START_BUTTON
#define BIND_VEHICLE_FIREWEAPON // Adds ability to rebind fire key for 'in vehicle' controls #define BIND_VEHICLE_FIREWEAPON // Adds ability to rebind fire key for 'in vehicle' controls
#define BUTTON_ICONS // use textures to show controller buttons #define BUTTON_ICONS // use textures to show controller buttons
#ifdef GTA_PC
#define GTA_PC_CONTROLS // enables keyboard and mouse. currently GTA_PC and a few other defines will not work without this
#endif
// Hud, frontend and radar // Hud, frontend and radar
#define PC_MENU #define PC_MENU