Apple-2-Tools/gsplus
1
0
Fork 0
mirror of https://github.com/digarok/gsplus.git synced 2024-11-24 06:34:02 +00:00
Code Issues Projects Releases Wiki Activity

merge resolve

Browse Source
This commit is contained in:
Dagen Brock 2016-04-24 10:31:52 -05:00
commit fd2bce9bbe
7 changed files with 27 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
.gitlab-ci.yml
View File

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

BIN
lib/arch/win32/cyggcc_s-1.dll
View File

Binary file not shown.

BIN
lib/arch/win32/cygstdc++-6.dll
View File

Binary file not shown.

BIN
lib/arch/win32/cygwin1.dll
View File

Binary file not shown.

0
src/GSport.bat → src/GSplus.bat
View File

24
src/Makefile
View File

@ -53,20 +53,18 @@ gsplusfb: $(OBJECTS) compile_time.o
mv gsplusfb .. mv gsplusfb ..
cp -f ../config.template ../config.txt cp -f ../config.template ../config.txt
# NOT CURRENTLY SUPPORTED # Mingw32 (native windows) / Cygwin builds:
# Mingw32 (native windows) builds: gsplus.exe: $(OBJECTS) compile_time.o
gsport.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 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 mkdir -p ../GSplus.app/lib
cp -f gsport.exe ../GSport.app/GSport.exe cp -f gsplus.exe ../GSplus.app/GSplus.exe
cp -f ../config.template ../GSport.app/config.txt cp -f ../config.template ../GSplus.app/config.txt
cp -f ../lib/*.ttf ../GSport.app/lib cp -f ../lib/*.ttf ../GSplus.app/lib
cp -f ../lib/arch/win32/*.dll ../GSport.app cp -f ../lib/arch/win32/*.dll ../GSplus.app
cp -f ../lib/NoBoot.po ../GSport.app cp -f ../lib/NoBoot.po ../GSplus.app
cp -f GSport.bat ../GSport.app/GSport.bat cp -f GSplus.bat ../GSplus.app/GSplus.bat
cp -f parallel.rom ../GSport.app cp -f parallel.rom ../GSplus.app
cp -f ../COPYING.txt ../GSport.app cp -f ../COPYING.txt ../GSplus.app
cp -f ../GSport.html ../GSport.app
# NOT CURRENTLY SUPPORTED # NOT CURRENTLY SUPPORTED
# Mac build - old style (deprecated) # Mac build - old style (deprecated)

6
src/vars_win32
View File

@ -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 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 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 CPPOPTS = -O2 -DGSPORT_LITTLE_ENDIAN -DHAVE_TFE -DTOGGLE_STATUS -DWIN32 -D_WIN32 -D__USE_W32_SOCKETS -D_WINSOCK2API_ -DHAVE_ATBRIDGE
SUFFIX = ".exe" SUFFIX = ".exe"
NAME = gsport NAME = gsplus
EXTRA_LIBS = -Larch/win32 -lcomdlg32 -lShlwapi -lIPHlpApi EXTRA_LIBS = -Larch/win32 -lcomdlg32 -lShlwapi -lIPHlpApi
XOPTS = -Wall -fomit-frame-pointer -march=i686 XOPTS = -Wall -fomit-frame-pointer -march=i686