Merge pull request #130 from OpenDriver2/develop-SoapyMan

Beta 2 Bug fixes

Author: SoapyMan

.appveyor/Build.bat

@@ -10,6 +10,8 @@ set SDL2_DIR=%windows_sdl2_dir%
 
 premake5 vs2019
 
+cd project_vs2019_windows
+
 set config=Debug:Release:Release_dev
 for %%c in (%config::= %) do (
     msbuild .\REDRIVER2.sln /p:Configuration="%%c" /p:Platform=Win32 /m ^

.appveyor/Build.sh

@@ -8,6 +8,8 @@ cd "$APPVEYOR_BUILD_FOLDER/src_rebuild"
 
 ./premake5 gmake2
 
+cd project_gmake2_linux
+
 for config in debug_x86 release_x86 release_dev_x86
 do
     make config=$config -j$(nproc)

.emscripten/style.css

@@ -5,7 +5,6 @@ html, body {overflow-x: hidden; padding: 0!important}
 html, section {
 	background-color: #600000;
 	color: white;
-	background-image: url(tanner.png);
 	height: 100vh;
 	width: 100vw;
 	-webkit-background-size: auto 100%;

.gitignore

@@ -37,5 +37,6 @@ src_rebuild/dependencies/*
 src_rebuild/.vs/*
 src_rebuild/bin/*
 src_rebuild/obj/*
+src_rebuild/project_*
 src_rebuild/*.make
 src_rebuild/Makefile

PSXToolchain/NPsyQ/include/inline_n.h

@@ -1,5 +1,5 @@
 /*
- *	GTE Macro definitions without use of DMPSX
+ *	GTE Macro definitions - special version for Nugget (NO DMPSX)
  */
 
 /*
@@ -607,7 +607,7 @@
 #define gte_llv1bk() __asm__ volatile (				\
 	"nop;"							\
 	"nop;"							\
-	"cop2 0x4AA012;" )
+	"cop2 0x04AA012;" )
 
 #define gte_llv2bk() __asm__ volatile (				\
 	"nop;"							\
@@ -841,7 +841,7 @@
 #define gte_llv2tr_b()		__asm__ volatile ( "cop2 0x04B0012;" )
 #define gte_llirtr_b()		__asm__ volatile ( "cop2 0x04B8012;" )
 #define gte_llv0bk_b()		__asm__ volatile ( "cop2 0x04A2012;" )
-#define gte_llv1bk_b()		__asm__ volatile ( "cop2 0x4AA012;" )
+#define gte_llv1bk_b()		__asm__ volatile ( "cop2 0x04AA012;" )
 #define gte_llv2bk_b()		__asm__ volatile ( "cop2 0x04B2012;" )
 #define gte_llirbk_b()		__asm__ volatile ( "cop2 0x04BA012;" )
 #define gte_lc_b()		__asm__ volatile ( "cop2 0x04DA412;" )

PSXToolchain/NPsyQ/ps-exe.ld

@@ -160,7 +160,8 @@ SECTIONS {
         *(.a0table)
         *(.data .data.* .gnu.linkonce.d.*)
         *(.data1)
-		*(.sdata .sdata.* .gnu.linkonce.s.*)
+        *(.sdata .sdata.* .gnu.linkonce.s.*)
+        *(.sdata2 .sdata2.* .gnu.linkonce.s2.*)
         *(.got.plt)
         *(.got)
         /* pad file to be a multiple of 2048 bytes.  Needed for loading from CD-ROM. */

appveyor.yml

@@ -1,4 +1,4 @@
-version: 7.0.{build}
+version: 7.2.{build}
 
 branches:
   only: