Merge branch 'experimental' of centralserv.gotgeeks.com:dbrock/gsplus into experimental

.gitignore

@@ -10,3 +10,8 @@ src/16inst_c.h
 src/8inst_c.h
 src/size_c.h
 
+gsplus
+gsportx
+gsport
+
+*.gsp

.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

assets/Info.plist

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+    <key>CFBundleDevelopmentRegion</key>
+    <string>English</string>
+    <key>CFBundleExecutable</key>
+    <string>gsplus</string>
+    <key>CFBundleGetInfoString</key>
+    <string>0.12s, Copyright 2016 Dagen Brock</string>
+    <key>CFBundleIconFile</key>
+    <string>gsp-icons.icns</string>
+    <key>CFBundleIdentifier</key>
+    <string>com.dagenbrock.gsplus</string>
+    <key>CFBundleDocumentTypes</key>
+    <array>
+    </array>
+    <key>CFBundleInfoDictionaryVersion</key>
+    <string>6.0</string>
+    <key>CFBundlePackageType</key>
+    <string>APPL</string>
+    <key>CFBundleShortVersionString</key>
+    <string>0.12s</string>
+    <key>CFBundleSignature</key>
+    <string>gsplus</string>
+    <key>CFBundleVersion</key>
+    <string>0.12s</string>
+    <key>NSHumanReadableCopyright</key>
+    <string>Copyright 2016 Dagen Brock</string>
+    <key>LSMinimumSystemVersion</key>
+    <string>10.3</string>
+</dict>
+</plist>

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

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/

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)