Next version (closed)

.gitignore

@@ -24,5 +24,11 @@ images/
 # Screenshot dir
 screens/
 
+# Builds dir
+build/
+# Gitlab CI Builds dir
+builds/
+
+
 # build tools that are often kept/tested locally as well as on the ci machines
 yoursway-create-dmg/

.gitlab-ci.yml

@@ -92,7 +92,6 @@ package-ubuntu-sdl2:
     - cp src/parallel.rom %PACKAGE_DIR%
     - cp LICENSE.txt $PACKAGE_DIR/doc/
     - cp doc/gsplusmanual.pdf %PACKAGE_DIR%
-    - cp doc/README.txt %PACKAGE_DIR%
     - tar -cvjf gsplus-ubuntu-sdl.tar.bz2 $PACKAGE_DIR
   artifacts:
     paths:
@@ -193,7 +192,7 @@ build-win32-gdi:
   only:
     - master
     - /^win.*/
-    - /^ks.*/
+    - /^next.*/
 
 package-win32-gdi:
   tags:
@@ -213,7 +212,6 @@ package-win32-gdi:
     - cp src/config.txt %PACKAGE_DIR%
     - cp src/parallel.rom %PACKAGE_DIR%
     - cp doc/gsplusmanual.pdf %PACKAGE_DIR%
-    - cp doc/README.txt %PACKAGE_DIR%
     - cp /mingw32/bin/libgcc_s_dw2-1.dll %PACKAGE_DIR%
     - cp /mingw32/bin/libstdc++-6.dll %PACKAGE_DIR%
     - cp /mingw32/bin/libwinpthread-1.dll %PACKAGE_DIR%
@@ -225,7 +223,7 @@ package-win32-gdi:
   only:
     - master
     - /^win.*/
-    - /^ks.*/
+    - /^next.*/
 
 deploy-win32-gdi:
   tags:
@@ -238,7 +236,7 @@ deploy-win32-gdi:
   only:
     - master
     - /^win.*/
-    - /^ks.*/
+    - /^next.*/
 
 # TARGET SYSTEM: MSYS2 MINGW32 SDL2
 build-win32-sdl2:
@@ -259,7 +257,7 @@ build-win32-sdl2:
   only:
     - master
     - /^win.*/
-    - /^ks.*/
+    - /^next.*/
 
 
 package-win32-sdl2:
@@ -277,7 +275,6 @@ package-win32-sdl2:
     - cp src/config.txt %PACKAGE_DIR%
     - cp src/parallel.rom %PACKAGE_DIR%
     - cp doc/gsplusmanual.pdf %PACKAGE_DIR%
-    - cp doc/README.txt %PACKAGE_DIR%
     - cp /mingw32/bin/libbz2-1.dll %PACKAGE_DIR%
     - cp /mingw32/bin/libfreetype-6.dll %PACKAGE_DIR%
     - cp /mingw32/bin/libgcc_s_dw2-1.dll %PACKAGE_DIR%

CMakeLists.txt

@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.1)
-project(gsplus VERSION 0.14)
+project(gsplus VERSION 0.15)
 
 
 if(CYGWIN OR MSYS)

COPYRIGHT.txt

@@ -1,19 +1,19 @@
 GSPLUS - Advanced Apple IIGS Emulator Environment
 Based on the KEGS emulator written by Kent Dickey
-Copyright (C) 2016 - 2018  Dagen Brock
+Copyright (C) 2016 - 2019  Dagen Brock
 Copyright (C) 2010 - 2014  GSport contributors
 Copyright (C) 2003 Kent Dickey
 
-This program is free software; you can redistribute it and/or modify it 
-under the terms of the GNU General Public License as published by the 
-Free Software Foundation; either version 2 of the License, or (at your 
+This program is free software; you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation; either version 2 of the License, or (at your
 option) any later version.
 
-This program is distributed in the hope that it will be useful, but 
-WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY 
-or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 
+This program is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
 for more details.
 
-You should have received a copy of the GNU General Public License along 
-with this program; if not, write to the Free Software Foundation, Inc., 
+You should have received a copy of the GNU General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA

doc/Developer-QuickStart-Rpi.txt

@@ -1,5 +1,5 @@
 # When building on Raspberry Pi, you need to get the hardware
-# accelerated graphics driver enabled with SDL2.  
+# accelerated graphics driver enabled with SDL2.
 # We borrow the SDL2 build from RetroPie which takes care of this for us.
 
 git clone https://github.com/RetroPie/RetroPie-Setup
@@ -8,10 +8,8 @@ sudo ./retropie_packages.sh sdl2
 
 
 # Then build GSplus like any other *nix system
-sudo apt-get update -y
-sudo apt-get install -y libpcap0.8-dev libsdl2-image-dev
+sudo apt-get install -y libpcap0.8-dev libsdl2-image-dev re2c cmake
 git clone https://github.com/digarok/gsplus.git
-cd gsplus/src
-ln -s vars_rpilinux_sdl2 vars
+mkdir build ; cd build
+cmake ..
 make
-

doc/Developer-QuickStart-Win32_SDL2.txt

@@ -25,9 +25,9 @@ rsync -a SDL2_image-2.0.3/i686-w64-mingw32/ /cygdrive/c/mingw/i686-w64-mingw32/
 
 # Build.
 git clone [email protected]:digarok/gsplus.git
-cd gsplus/src
-ln -s vars_win32_sdl2 vars
-make clean ; make
+md build ; cd build
+cmake ..
+make
 
 
 # if you want to make a machine that can also deploy to s3 (gitlabci):

doc/README.md

@@ -0,0 +1,3 @@
+See gsplusmanual.pdf for GSplus usage.
+
+See specific docs files for building on your platform.

make_dist_mac.sh

@@ -1,7 +1,7 @@
 DEXTRAS=gsplus-osx/
 DDIR=$DEXTRAS/GSplus.app
 ADIR=assets
-mkdir -p $DEXTRAS/license
+
 mkdir -p $DDIR/Contents/MacOS
 mkdir -p $DDIR/Contents/Resources
 
@@ -13,8 +13,7 @@ dylibbundler -od -b -x $DDIR/Contents/MacOS/gsplus -d $DDIR/Contents/libs/
 
 # files to include in dmg
 cp doc/gsplusmanual.pdf $DEXTRAS
-cp doc/README.txt $DEXTRAS
-cp LICENSE.txt $DEXTRAS/license
-cp COPYRIGHT.txt $DEXTRAS/license
+cp LICENSE.txt $DEXTRAS
+cp COPYRIGHT.txt $DEXTRAS
 
 # packaging now in DMG script

make_dmg_mac.sh

@@ -13,9 +13,9 @@ test -f GSplus-Install.dmg && rm GSplus-Install.dmg
   --icon GSplus.app 250 210 \
   --hide-extension GSplus.app \
   --app-drop-link 440 210 \
-  --icon README.txt  225 350 \
   --icon gsplusmanual.pdf  350 350 \
-  --icon license  470 350 \
+  --icon COPYRIGHT.txt  400 350 \
+  --icon LICENSE.txt  470 350 \
   GSplus-Install.dmg \
   ../gsplus-osx/
 cp GSplus-Install.dmg ..

src/debug_shell.re2c

@@ -93,6 +93,7 @@ static char *get_resource_path(const char *leaf) {
 #elif defined(_WIN32)
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
+#undef RELATIVE /* Go fuck your self wingdi */
 /* todo -- something clever like find the home directory */
 static char *get_resource_path(const char *leaf) {
 	DWORD size;

src/sim65816.c

@@ -181,7 +181,7 @@ int g_imagewriter_paper = 0;
 int g_imagewriter_banner = 0;
 
 int g_config_iwm_vbl_count = 0;
-const char g_gsplus_version_str[] = "0.14";
+const char g_gsplus_version_str[] = "0.15a";
 int g_pause=0;  // OG Added pause
 
 #define START_DCYCS     (0.0)