diff --git a/.gitignore b/.gitignore index 2c7ff0f..878e6b4 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,8 @@ src/16inst_c.h src/8inst_c.h src/size_c.h +gsplus +gsportx +gsport + +*.gsp diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 66734b5..6403a1e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,6 +1,7 @@ stages: - build + - package build-ubuntu-x: tags: @@ -42,6 +43,22 @@ build-osx: - cd src - ln -s vars_osx_sdl2 vars - make clean ; make + artifacts: + paths: + - gsplus + expire_in: 5 minutes + +package-osx: + tags: + - osx + stage: package + script: + - chmod +x make_dist_mac.sh + - ./make_dist_mac.sh + artifacts: + paths: + - gsplus-osx.tar.gz + @@ -54,3 +71,15 @@ build-win32: - ln -s vars_win32 vars - make clean - make + artifacts: + paths: + - gsplus.exe + expire_in: 5 minutes + +package-win32: + tags: + - windows + stage: package + artifacts: + paths: + - gsplus.exe diff --git a/assets/Info.plist b/assets/Info.plist new file mode 100644 index 0000000..9a2ed8a --- /dev/null +++ b/assets/Info.plist @@ -0,0 +1,33 @@ + + + + + CFBundleDevelopmentRegion + English + CFBundleExecutable + gsplus + CFBundleGetInfoString + 0.12s, Copyright 2016 Dagen Brock + CFBundleIconFile + gsp-icons.icns + CFBundleIdentifier + com.dagenbrock.gsplus + CFBundleDocumentTypes + + + CFBundleInfoDictionaryVersion + 6.0 + CFBundlePackageType + APPL + CFBundleShortVersionString + 0.12s + CFBundleSignature + gsplus + CFBundleVersion + 0.12s + NSHumanReadableCopyright + Copyright 2016 Dagen Brock + LSMinimumSystemVersion + 10.3 + + diff --git a/assets/gsp-icons.icns b/assets/gsp-icons.icns new file mode 100644 index 0000000..b7e2c2c Binary files /dev/null and b/assets/gsp-icons.icns differ diff --git a/bin/osx/gsplus b/bin/osx/gsplus deleted file mode 100644 index 487871e..0000000 Binary files a/bin/osx/gsplus and /dev/null differ diff --git a/doc/Developer-QuickStart-Linux.txt b/doc/Developer-QuickStart-Linux.txt index 0695714..f5a6f40 100644 --- a/doc/Developer-QuickStart-Linux.txt +++ b/doc/Developer-QuickStart-Linux.txt @@ -9,6 +9,11 @@ sudo apt-get -y install libpcap0.8-dev sudo apt-get -y install libx11-dev sudo apt-get -y install libxext-dev +# sdl +sudo apt-get -y install libsdl1.2-dev +sudo apt-get -y install libsdl2-dev +sudo apt-get -y install libfreetype6-dev + # build git clone git@github.com:digarok/gsplus.git cd gsplus/src diff --git a/lib/arch/mac/setfileicon b/lib/arch/mac/setfileicon old mode 100755 new mode 100644 diff --git a/make_dist_mac.sh b/make_dist_mac.sh new file mode 100755 index 0000000..ddf2f6d --- /dev/null +++ b/make_dist_mac.sh @@ -0,0 +1,10 @@ +DDIR=gsplus-osx/GSplus.app +ADIR=assets +mkdir -p $DDIR/Contents/MacOS +mkdir -p $DDIR/Contents/Resources + +cp gsplus $DDIR/Contents/MacOS +cp $ADIR/Info.plist $DDIR/Contents +cp $ADIR/gsp-icons.icns $DDIR/Contents/Resources +dylibbundler -od -b -x $DDIR/Contents/MacOS/gsplus -d $DDIR/Contents/libs/ +tar -cvzf gsplus-osx.tar.gz gsplus-osx/ diff --git a/src/Makefile b/src/Makefile index b57c0e1..f5d8484 100644 --- a/src/Makefile +++ b/src/Makefile @@ -34,10 +34,9 @@ specials_clean: # Linux/OSX SDL builds gsplus: $(OBJECTS) compile_time.o - $(LD) $(CCOPTS) $(LDOPTS) $(OBJECTS) compile_time.o $(LDFLAGS) -o $(NAME)$(SUFFIX) $(EXTRA_LIBS) + $(LD) $(CCOPTS) $(LDOPTS) $(OBJECTS) compile_time.o $(LDFLAGS) -o $(NAME)$(SUFFIX) $(EXTRA_LIBS) echo $(OBJECTS) cp gsplus .. - cp gsplus ../bin/osx # Linux/OSX XWindows builds gsplusx: $(OBJECTS) compile_time.o @@ -45,28 +44,29 @@ gsplusx: $(OBJECTS) compile_time.o echo $(OBJECTS) mv gsplusx .. -# NOT CURRENTLY SUPPORTED +# NOT CURRENTLY SUPPORTED # Linux framebuffer builds: gsplusfb: $(OBJECTS) compile_time.o $(LD) $(CCOPTS) $(LDOPTS) $(OBJECTS) compile_time.o $(LDFLAGS) -o $(NAME)$(SUFFIX) $(EXTRA_LIBS) echo $(OBJECTS) mv gsplusfb .. - cp -f ../config.template ../config.txt + cp -f ../config.template ../config.txt # 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 ../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 + #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 + cp gsplus.exe .. -# NOT CURRENTLY SUPPORTED +# NOT CURRENTLY SUPPORTED # Mac build - old style (deprecated) gsportmac: $(OBJECTS) compile_time.o $(CC) $(CCOPTS) $(LDOPTS) $(OBJECTS) compile_time.o $(LDFLAGS) -o gsport $(EXTRA_LIBS) diff --git a/src/arch/mac/classes.nib b/src/arch/mac/classes.nib old mode 100755 new mode 100644 diff --git a/src/arch/mac/makedmg.sh b/src/arch/mac/makedmg.sh old mode 100755 new mode 100644 diff --git a/src/macdriver_console.c b/src/macdriver_console.c old mode 100755 new mode 100644 diff --git a/src/macdriver_generic.c b/src/macdriver_generic.c old mode 100755 new mode 100644 diff --git a/src/make_inst b/src/make_inst old mode 100755 new mode 100644 diff --git a/src/make_size b/src/make_size old mode 100755 new mode 100644 diff --git a/src/make_win b/src/make_win old mode 100755 new mode 100644 diff --git a/src/partls.c b/src/partls.c old mode 100755 new mode 100644 diff --git a/src/prodos.h b/src/prodos.h old mode 100755 new mode 100644 diff --git a/src/prodos_protos.h b/src/prodos_protos.h old mode 100755 new mode 100644 diff --git a/src/to_pro.c b/src/to_pro.c old mode 100755 new mode 100644