Bumping version to 4.2

Javanaise · Feb 6, 2018 · 4002e22 · 4002e22
1 parent 2635a3a
commit 4002e22
Show file tree

Hide file tree

Showing 23 changed files with 370,219 additions and 312,795 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1,3 @@
+/tests export-ignore  
+.gitattributes export-ignore  
+.gitignore export-ignore
diff --git a/Assets/ai.txt b/Assets/ai.txt
diff --git a/Assets/mrboom.libretro b/Assets/mrboom.libretro
@@ -1,6 +1,6 @@
 [Libretro]
 Type=Game
-Version=4.1
+Version=4.2
 Name=MrBoom
 Icon=mrboom
 Module=mrboom_libretro.so

diff --git a/Assets/mrboom.rc b/Assets/mrboom.rc
@@ -1,20 +1,20 @@
 id ICON "./mrboom.ico"
 1 VERSIONINFO
-FILEVERSION     4,1,0,0
-PRODUCTVERSION  4,1,0,0
+FILEVERSION     4,2,0,0
+PRODUCTVERSION  4,2,0,0
 BEGIN
   BLOCK "StringFileInfo"
   BEGIN
     BLOCK "080904E4"
     BEGIN
       VALUE "CompanyName", "Remdy Software"
       VALUE "FileDescription", "MrBoom"
-      VALUE "FileVersion", "4.1"
+      VALUE "FileVersion", "4.2"
       VALUE "InternalName", "mrboom"
       VALUE "LegalCopyright", "Remdy Software"
       VALUE "OriginalFilename", "MrBoom.exe"
       VALUE "ProductName", "MrBoom"
-      VALUE "ProductVersion", "4.1"
+      VALUE "ProductVersion", "4.2"
     END
   END
   BLOCK "VarFileInfo"

diff --git a/Makefile b/Makefile
@@ -249,6 +249,10 @@ else
 CXXFLAGS += -std=c++98
 endif
 
+ifneq ($(SCREENSHOTS),)
+CXXFLAGS += -std=c++11 -Isdl2/xBRZ 
+endif
+
 CFLAGS += $(INCFLAGS) -Wall -pedantic $(fpic)
 
 ifneq (,$(findstring qnx,$(platform)))

diff --git a/Makefile.common b/Makefile.common
@@ -53,7 +53,8 @@ SOURCES_C += $(LIBRETRO_COMM_DIR)/formats/bmp/rbmp_encode.c \
 endif
 
 ifneq ($(SCREENSHOTS),)
-SOURCES_CXX += $(CORE_DIR)/tests/tests.cpp
+SOURCES_CXX += $(CORE_DIR)/tests/tests.cpp \
+               $(CORE_DIR)/sdl2/xBRZ/xbrz.cpp
 SOURCES_C += $(LIBRETRO_COMM_DIR)/formats/bmp/rbmp_encode.c \
     $(LIBRETRO_COMM_DIR)/encodings/encoding_crc32.c
 INCFLAGS          += -DSCREENSHOTS 

diff --git a/README.md b/README.md
@@ -6,14 +6,7 @@ It runs on all RetroArch platforms: Android, Linux, Mac Os X, Nintendo Gamecube
 
 It can also be compiled as a stand-alone version using SDL2.
 
-![alt tag](Assets/mrb0.png)
-![alt tag](Assets/mrb1.png)
-
-![alt tag](Assets/mrb2.png)
-![alt tag](Assets/mrb4.png)
-
-![alt tag](Assets/mrb5.png)
-![alt tag](Assets/draw.gif)
+![alt tag](tests/screenshots/mrboom-5.gif)
 
 Mr.Boom supports up to 8 players and features like netplay, AI bots [(new C++ feature)](ai/), pushing bombs, remote controls and kangaroo riding...
 

diff --git a/ai/README.md b/ai/README.md
@@ -1,3 +1,8 @@
+![alt tag](bt.png)
+
+Using a c++98 port of arvidsson's [behavior tree library](https://github.com/arvidsson/bt). 
+See [logs](../Assets/ai.txt).
+
 ![alt tag](../tests/screenshots/mrboom-0.gif)
 ![alt tag](../tests/screenshots/mrboom-1.gif)
 ![alt tag](../tests/screenshots/mrboom-2.gif)
@@ -6,6 +11,4 @@
 ![alt tag](../tests/screenshots/mrboom-5.gif)
 ![alt tag](../tests/screenshots/mrboom-6.gif)
 ![alt tag](../tests/screenshots/mrboom-7.gif)
-![alt tag](bt.png)
 
-Using a c++98 port of arvidsson's [behavior tree library](https://github.com/arvidsson/bt).
diff --git a/common.cpp b/common.cpp
@@ -311,10 +311,12 @@ bool mrboom_init()
 #ifdef LOAD_FROM_FILES
    char tmpDir[PATH_MAX_LENGTH];
    snprintf(tmpDir, sizeof(tmpDir), "%s", "/tmp");
+#ifndef __APPLE__
    if (getenv("HOME") != NULL)
    {
       snprintf(tmpDir, sizeof(tmpDir), "%s", getenv("HOME"));
    }
+#endif
    if (getenv("TMP") != NULL)
    {
       snprintf(tmpDir, sizeof(tmpDir), "%s", getenv("TMP"));

diff --git a/common.hpp b/common.hpp
@@ -8,7 +8,7 @@
 extern "C" {
 #endif
 #define GAME_NAME            "Mr.Boom"
-#define GAME_VERSION         "4.1"
+#define GAME_VERSION         "4.2"
 #define PATH_MAX_LENGTH      256
 #define WIDTH                320
 #define HEIGHT               200

diff --git a/mrboom.c b/mrboom.c