[patch] Install patch

blobby2-1.0-fix_install.patch (text/plain), 3.66 KB, created by Adrien D on 2015-10-31 22:27:59 UTC

diff -Naur blobby-1.0.orig/data/CMakeLists.txt blobby-1.0/data/CMakeLists.txt
--- blobby-1.0.orig/data/CMakeLists.txt	2014-03-22 14:31:26.000000000 +0100
+++ blobby-1.0/data/CMakeLists.txt	2014-06-18 14:14:17.374122982 +0200
@@ -24,12 +24,14 @@
 	${CMAKE_CURRENT_BINARY_DIR}/scripts.zip
 	${CMAKE_CURRENT_BINARY_DIR}/backgrounds.zip
 	${CMAKE_CURRENT_BINARY_DIR}/rules.zip
+	Icon.bmp
 	config.xml
 	inputconfig.xml
 	server/server.xml
 	lang_de.xml
 	lang_en.xml
-	lang_fr.xml)
+	lang_fr.xml
+	lang_it.xml)
 
 if (WIN32)
 	install(FILES ${install_files} DESTINATION data)
diff -Naur blobby-1.0.orig/src/main.cpp blobby-1.0/src/main.cpp
--- blobby-1.0.orig/src/main.cpp	2014-03-22 14:31:22.000000000 +0100
+++ blobby-1.0/src/main.cpp	2014-06-18 14:14:26.420129508 +0200
@@ -26,16 +26,16 @@
 
 #include <SDL2/SDL.h>
 
-#ifndef __APPLE__
-#ifndef __ANDROID__
-#include "config.h"
-#endif
-#endif
+#include "Global.h"
 
 #ifdef __APPLE__
 	#if TARGET_OS_IPHONE || TARGET_IPHONE_SIMULATOR
 		#include <physfs.h>
-	#else
+	#endif
+#endif
+
+#if __DESKTOP__
+	#ifndef WIN32
 		#include "config.h"
 	#endif
 #endif
@@ -99,14 +99,6 @@
 	#if defined(WIN32)
 		// Just write in installation directory
 		fs.setWriteDir("data");
-
-		// handle the case when it is installed
-		fs.addToSearchPath(BLOBBY_INSTALL_PREFIX  "/share/blobby");
-		fs.addToSearchPath(BLOBBY_INSTALL_PREFIX  "/share/blobby/gfx.zip");
-		fs.addToSearchPath(BLOBBY_INSTALL_PREFIX  "/share/blobby/sounds.zip");
-		fs.addToSearchPath(BLOBBY_INSTALL_PREFIX  "/share/blobby/scripts.zip");
-		fs.addToSearchPath(BLOBBY_INSTALL_PREFIX  "/share/blobby/backgrounds.zip");
-		fs.addToSearchPath(BLOBBY_INSTALL_PREFIX  "/share/blobby/rules.zip");
 	#else
 		#ifndef __ANDROID__
 			// Create a search path in the home directory and ensure that
@@ -118,7 +110,16 @@
 					std::string userdir = fs.getUserDir();
 				#endif
 			#else
+				// Linux
 				std::string userdir = fs.getUserDir();
+
+				// handle the case when it is installed
+				fs.addToSearchPath(BLOBBY_INSTALL_PREFIX  "/share/blobby");
+				fs.addToSearchPath(BLOBBY_INSTALL_PREFIX  "/share/blobby/gfx.zip");
+				fs.addToSearchPath(BLOBBY_INSTALL_PREFIX  "/share/blobby/sounds.zip");
+				fs.addToSearchPath(BLOBBY_INSTALL_PREFIX  "/share/blobby/scripts.zip");
+				fs.addToSearchPath(BLOBBY_INSTALL_PREFIX  "/share/blobby/backgrounds.zip");
+				fs.addToSearchPath(BLOBBY_INSTALL_PREFIX  "/share/blobby/rules.zip");
 			#endif
 			std::string userAppend = ".blobby";
 			std::string homedir = userdir + userAppend;
diff -Naur blobby-1.0.orig/src/server/servermain.cpp blobby-1.0/src/server/servermain.cpp
--- blobby-1.0.orig/src/server/servermain.cpp	2014-03-22 14:31:22.000000000 +0100
+++ blobby-1.0/src/server/servermain.cpp	2014-06-18 14:14:26.420129508 +0200
@@ -36,6 +36,7 @@
 #include "SpeedController.h"
 #include "FileSystem.h"
 #include "UserConfig.h"
+#include "Global.h"
 
 // platform specific
 #ifndef WIN32
@@ -45,6 +46,12 @@
 #include <cstdarg>
 #endif
 
+#if __DESKTOP__
+#ifndef WIN32
+#include "config.h"
+#endif
+#endif
+
 
 
 /* implementation */
@@ -85,8 +92,7 @@
 	process_arguments(argc, argv);
 
 	FileSystem fileSys(argv[0]);
-	fileSys.addToSearchPath("data" + fileSys.getDirSeparator() + "rules.zip");
-
+	
 	if (!g_run_in_foreground)
 	{
 		fork_to_background();
@@ -312,7 +318,15 @@
 void setup_physfs(char* argv0)
 {
 	FileSystem& fs = FileSystem::getSingleton();
+
+	#if __DESKTOP__
+	#ifndef WIN32
+		fs.addToSearchPath(BLOBBY_INSTALL_PREFIX  "/share/blobby");
+		fs.addToSearchPath(BLOBBY_INSTALL_PREFIX  "/share/blobby/rules.zip");
+	#endif
+	#endif	
 	fs.addToSearchPath("data");
+	fs.addToSearchPath("data" + fs.getDirSeparator() + "rules.zip");
 }