Merge pull request cxd4#29 from ExtremeDude2/windows-compile-fix

Fix plugin build on Windows with modern MinGW versions
GhostlyDark · Oct 18, 2020 · 855a26f · 855a26f
2 parents 3e30349 + 32a6f64
commit 855a26f
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/make_w32.cmd b/make_w32.cmd
@@ -8,6 +8,7 @@ REM to execute the Unix shell script "make.sh" from Windows 10+ or Git Bash.
 
 REM The following line is the only one you should ever need to change.
 set MinGW=C:\MinGW
+REM set MinGW=C:\msys64\mingw32
 
 set lib=%MinGW%\lib
 set bin=%MinGW%\bin
@@ -71,6 +72,6 @@ as -o "%obj%\vu\divide.o"         "%obj%\vu\divide.asm"
 ECHO.
 
 ECHO Linking assembled object files...
-ld --shared -e _DllMain@12 -o "%obj%\rspdebug.dll" -L %lib% %OBJ_LIST% -lmsvcrt
+gcc --shared -e _DllMain@12 -o "%obj%\rspdebug.dll" -L %lib% %OBJ_LIST% -lmsvcrt
 strip -o "%obj%\rsp.dll" "%obj%\rspdebug.dll" --strip-all
 PAUSE
diff --git a/make_w64.cmd b/make_w64.cmd
@@ -75,6 +75,6 @@ as -o "%obj%\vu\divide.o"         "%obj%\vu\divide.asm"
 ECHO.
 
 ECHO Linking assembled object files...
-ld --shared -e DllMain -o "%obj%\rspdebug.dll" -L%lib64% %OBJ_LIST% -lmsvcrt
+gcc --shared -e DllMain -o "%obj%\rspdebug.dll" -L%lib64% %OBJ_LIST% -lmsvcrt
 strip -o "%obj%\rsp.dll" "%obj%\rspdebug.dll" --strip-all
 PAUSE
diff --git a/su.h b/su.h
@@ -268,7 +268,7 @@ extern void set_PC(unsigned int address);
 #define SP_STATUS_SIG6          (0x00000001ul << 13)
 #define SP_STATUS_SIG7          (0x00000001ul << 14)
 
-enum {
+typedef enum {
     RCP_SP_MEM_ADDR_REG,
     RCP_SP_DRAM_ADDR_REG,
     RCP_SP_RD_LEN_REG,