merge resolve

.gitlab-ci.yml

@@ -42,3 +42,14 @@ build-osx:
     - cd src
     - ln -s vars_osx_sdl2 vars
     - make clean ; make
+
+
+
+build-win32:
+  tags:
+    - windows
+  stage: build
+  script:
+    - cd src
+    - ln -s vars_win32 vars
+    - make clean ; make

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)

src/vars_win32

@@ -1,9 +1,11 @@
-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