Merge branch 'miami' into lcs

# Conflicts: # src/control/Script.cpp # src/control/Script3.cpp # src/extras/custompipes_d3d9.cpp # src/extras/custompipes_gl.cpp
2021-01-12 12:45:56 +02:00
parent 167a841010 75367e714a
commit cb4b4d584c
25 changed files with 194 additions and 56 deletions
--- a/src/core/Frontend.cpp
+++ b/src/core/Frontend.cpp
@ -3,6 +3,7 @@
 #include <dinput.h>
 #endif

+#define FORCE_PC_SCALING
 #define WITHWINDOWS
 #include "common.h"
 #ifndef PS2_MENU