prepare version bump

.gitignore

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

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)

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 git@github.com: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.

doc/README.txt

@@ -1,50 +0,0 @@
-Getting started
-===============
-
-1. Download the emulator package from https://apple2.gs/plus and put it in a folder.
-   Yes, you can drag it into your Applications on a Mac, but be aware that it is
-   meant to be launched from a command line.  If you put it in Applications, you
-   should be able to run it with the terminal command:
-     /Applications/GSplus.app/Contents/MacOS/gsplus
-
-2. Download the Apple IIgs Firmware ROMs, for either a ROM01 or ROM03 machine.
-    (If you have a real IIgs, there are ways to save it from your machine too.)
-   Try: ftp://ftp.apple.asimov.net/pub/apple_II/emulators/rom_images/
-   a. Put the ROM image in the same folder where you run the emulator from.
-      It will search for:  "ROM", "ROM.01", "ROM.03"
-      If your ROM file has some other name, launch gsplus and hit F4 to go to
-      the config menu to choose your ROM under "ROM File Selection"
-     ... or ...
-
-3. Edit your config:
-   You can manually edit the config.txt file (or use the F4 menu.)
-   You can set disks using a slot/number syntax like:
-     s5d1 = images/ArkanoidII.po
-     s6d1 = images/ProDOS_2_4_1.dsk
-     s7d1 = images/gsos.2mg
-
-   You can also manually set your ROM path like:
-     g_cfg_rom_path = ../roms/gsrom03
-
-3. Get some Apple IIgs software.
-   I recommend the excellent Apple IIgs dedicated site:
-    http://www.whatisthe2gs.apple2.org.za/
-   If you have a real IIgs, you can transfer your disks using ADTPro
-    http://adtpro.sourceforge.net/
-
-5. Boot the Apple IIgs by running the emulator
-    Windows:                gsplus32.exe
-    Mac/Ubuntu:             ./gsplus
-    Mac (if in Apps)        /Applications/GSplus.app/Contents/MacOS/gsplus
-
-   If the config file can’t be found, it will try to create a config.txt file for you,
-   with all of the defaults.
-
-   Note: You can also specify a config file.  This is very useful as you can have specific
-   disks/setting pre-set in a config file and launch directly into your favorite game with
-   that config.  They can be named anything you want, though the officially recognized
-   extensions are .txt and .gsp.
-
-   Examples:
-    Windows:                gsplus32.exe -config arkanoid.gsp
-     Mac/Ubuntu:            ./gsplus -config choplifter_config.txt

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)