diff --git a/codewarrior/reVC.mcp.xml b/codewarrior/reVC.mcp.xml
index 64f985fd..24cf5781 100644
--- a/codewarrior/reVC.mcp.xml
+++ b/codewarrior/reVC.mcp.xml
@@ -1879,7 +1879,7 @@
Name
- CdStream.cpp
+ CdStream_win.cpp
Windows
Text
Debug
@@ -1891,13 +1891,6 @@
Text
-
- Name
- CdStreamPosix.cpp
- Windows
- Text
- Debug
-
Name
Clock.cpp
@@ -2521,13 +2514,6 @@
Text
-
- Name
- math.cpp
- Windows
- Text
- Debug
-
Name
maths.h
@@ -2598,6 +2584,13 @@
Text
+
+ Name
+ VuVector.cpp
+ Windows
+ Text
+ Debug
+
Name
VuVector.h
@@ -4830,7 +4823,7 @@
Name
- CdStream.cpp
+ CdStream_win.cpp
Windows
@@ -4838,11 +4831,6 @@
CdStream.h
Windows
-
- Name
- CdStreamPosix.cpp
- Windows
-
Name
Clock.cpp
@@ -5288,11 +5276,6 @@
Physical.h
Windows
-
- Name
- math.cpp
- Windows
-
Name
maths.h
@@ -5343,6 +5326,11 @@
Vector2D.h
Windows
+
+ Name
+ VuVector.cpp
+ Windows
+
Name
VuVector.h
@@ -8416,7 +8404,7 @@
Name
- CdStream.cpp
+ CdStream_win.cpp
Windows
Text
Debug
@@ -8428,13 +8416,6 @@
Text
-
- Name
- CdStreamPosix.cpp
- Windows
- Text
- Debug
-
Name
Clock.cpp
@@ -9058,13 +9039,6 @@
Text
-
- Name
- math.cpp
- Windows
- Text
- Debug
-
Name
maths.h
@@ -9135,6 +9109,13 @@
Text
+
+ Name
+ VuVector.cpp
+ Windows
+ Text
+ Debug
+
Name
VuVector.h
@@ -11367,7 +11348,7 @@
Name
- CdStream.cpp
+ CdStream_win.cpp
Windows
@@ -11375,11 +11356,6 @@
CdStream.h
Windows
-
- Name
- CdStreamPosix.cpp
- Windows
-
Name
Clock.cpp
@@ -11825,11 +11801,6 @@
Physical.h
Windows
-
- Name
- math.cpp
- Windows
-
Name
maths.h
@@ -11880,6 +11851,11 @@
Vector2D.h
Windows
+
+ Name
+ VuVector.cpp
+ Windows
+
Name
VuVector.h
@@ -13941,7 +13917,7 @@
Debug
Name
- CdStream.cpp
+ CdStream_win.cpp
Windows
@@ -13950,12 +13926,6 @@
CdStream.h
Windows
-
- Debug
- Name
- CdStreamPosix.cpp
- Windows
-
Debug
Name
@@ -14494,12 +14464,6 @@
math
-
- Debug
- Name
- math.cpp
- Windows
-
Debug
Name
@@ -14560,6 +14524,12 @@
Vector2D.h
Windows
+
+ Debug
+ Name
+ VuVector.cpp
+ Windows
+
Debug
Name
diff --git a/src/core/config.h b/src/core/config.h
index 63e8b774..54f16628 100644
--- a/src/core/config.h
+++ b/src/core/config.h
@@ -189,6 +189,7 @@ enum Config {
# define GTA_SCENE_EDIT
# define PC_MENU
# 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_MOBILE
# define MISSION_REPLAY
@@ -351,9 +352,6 @@ enum Config {
#define REGISTER_START_BUTTON
#define BIND_VEHICLE_FIREWEAPON // Adds ability to rebind fire key for 'in vehicle' controls
#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
#define PC_MENU