diff --git a/lib/arch/win32/cyggcc_s-1.dll b/lib/arch/win32/cyggcc_s-1.dll index d446981..156cf18 100644 Binary files a/lib/arch/win32/cyggcc_s-1.dll and b/lib/arch/win32/cyggcc_s-1.dll differ diff --git a/lib/arch/win32/cygstdc++-6.dll b/lib/arch/win32/cygstdc++-6.dll index 77e79f6..7e8d5f8 100644 Binary files a/lib/arch/win32/cygstdc++-6.dll and b/lib/arch/win32/cygstdc++-6.dll differ diff --git a/lib/arch/win32/cygwin1.dll b/lib/arch/win32/cygwin1.dll index 3db37e7..0a386c7 100644 Binary files a/lib/arch/win32/cygwin1.dll and b/lib/arch/win32/cygwin1.dll differ diff --git a/src/GSport.bat b/src/GSplus.bat similarity index 100% rename from src/GSport.bat rename to src/GSplus.bat diff --git a/src/Makefile b/src/Makefile index 12c4df2..08cc805 100644 --- a/src/Makefile +++ b/src/Makefile @@ -53,20 +53,18 @@ gsplusfb: $(OBJECTS) compile_time.o mv gsplusfb .. cp -f ../config.template ../config.txt -# NOT CURRENTLY SUPPORTED -# Mingw32 (native windows) builds: -gsport.exe: $(OBJECTS) compile_time.o +# Mingw32 (native windows) / Cygwin builds: +gsplus.exe: $(OBJECTS) compile_time.o g++ $(CCOPTS) $(LDOPTS) $(OBJECTS) compile_time.o $(LDFLAGS) -o $(NAME)$(SUFFIX) $(EXTRA_LIBS) -lwinmm -lgdi32 -ldsound -lcomctl32 -lws2_32 -lshell32 - mkdir -p ../GSport.app/lib - cp -f gsport.exe ../GSport.app/GSport.exe - cp -f ../config.template ../GSport.app/config.txt - cp -f ../lib/*.ttf ../GSport.app/lib - cp -f ../lib/arch/win32/*.dll ../GSport.app - cp -f ../lib/NoBoot.po ../GSport.app - cp -f GSport.bat ../GSport.app/GSport.bat - cp -f parallel.rom ../GSport.app - cp -f ../COPYING.txt ../GSport.app - cp -f ../GSport.html ../GSport.app + mkdir -p ../GSplus.app/lib + cp -f gsplus.exe ../GSplus.app/GSplus.exe + cp -f ../config.template ../GSplus.app/config.txt + cp -f ../lib/*.ttf ../GSplus.app/lib + cp -f ../lib/arch/win32/*.dll ../GSplus.app + cp -f ../lib/NoBoot.po ../GSplus.app + cp -f GSplus.bat ../GSplus.app/GSplus.bat + cp -f parallel.rom ../GSplus.app + cp -f ../COPYING.txt ../GSplus.app # NOT CURRENTLY SUPPORTED # Mac build - old style (deprecated) diff --git a/src/vars_win32 b/src/vars_win32 index d784d55..5dbeb16 100644 --- a/src/vars_win32 +++ b/src/vars_win32 @@ -1,10 +1,12 @@ -TARGET = gsport.exe +TARGET = gsplus.exe + OBJECTS = $(OBJECTS1) $(TFEOBJ) $(ATOBJ) $(PCAPOBJ) scc_windriver.o win32snd_driver.o win_console.o win_generic.o gsport32.o CCOPTS = -O2 -DGSPORT_LITTLE_ENDIAN -DHAVE_TFE -DWIN_SOUND -DTOGGLE_STATUS -DWIN32 -D_WIN32 -D__USE_W32_SOCKETS -D_WINSOCK2API_ -std=gnu99 -DHAVE_ATBRIDGE CPPOPTS = -O2 -DGSPORT_LITTLE_ENDIAN -DHAVE_TFE -DTOGGLE_STATUS -DWIN32 -D_WIN32 -D__USE_W32_SOCKETS -D_WINSOCK2API_ -DHAVE_ATBRIDGE + SUFFIX = ".exe" -NAME = gsport +NAME = gsplus EXTRA_LIBS = -Larch/win32 -lcomdlg32 -lShlwapi -lIPHlpApi XOPTS = -Wall -fomit-frame-pointer -march=i686 -XLIBS = \ No newline at end of file +XLIBS =