Attachment #415836 for bug #468766




	${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_it.xml)

if (WIN32)
	install(FILES ${install_files} DESTINATION data)





#include <SDL2/SDL.h>

#include "Global.h"
#ifndef __ANDROID__
#include "config.h"
#endif
#endif

#ifdef __APPLE__
	#if TARGET_OS_IPHONE || TARGET_IPHONE_SIMULATOR
		#include <physfs.h>
	#endif
#endif

#if __DESKTOP__
	#ifndef WIN32
		#include "config.h"
	#endif
#endif

	#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

					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;

Lines 36-41 Link Here

(-)blobby-1.0.orig/src/server/servermain.cpp (-2 / +16 lines)
36	#include "SpeedController.h"	36	#include "SpeedController.h"
37	#include "FileSystem.h"	37	#include "FileSystem.h"
38	#include "UserConfig.h"	38	#include "UserConfig.h"
		39	#include "Global.h"
39		40
40	// platform specific	41	// platform specific
41	#ifndef WIN32	42	#ifndef WIN32
Lines 45-50 Link Here
45	#include <cstdarg>	46	#include <cstdarg>
46	#endif	47	#endif
47		48
		49	#if __DESKTOP__
		50	#ifndef WIN32
		51	#include "config.h"
		52	#endif
		53	#endif
		54
48		55
49		56
50	/* implementation */	57	/* implementation */
Lines 85-92 Link Here
85	process_arguments(argc, argv);	92	process_arguments(argc, argv);
86		93
87	FileSystem fileSys(argv[0]);	94	FileSystem fileSys(argv[0]);
88	fileSys.addToSearchPath("data" + fileSys.getDirSeparator() + "rules.zip");	95
89
90	if (!g_run_in_foreground)	96	if (!g_run_in_foreground)
91	{	97	{
92	fork_to_background();	98	fork_to_background();
Lines 312-318 Link Here
312	void setup_physfs(char* argv0)	318	void setup_physfs(char* argv0)
313	{	319	{
314	FileSystem& fs = FileSystem::getSingleton();	320	FileSystem& fs = FileSystem::getSingleton();
		321
		322	#if __DESKTOP__
		323	#ifndef WIN32
		324	fs.addToSearchPath(BLOBBY_INSTALL_PREFIX "/share/blobby");
		325	fs.addToSearchPath(BLOBBY_INSTALL_PREFIX "/share/blobby/rules.zip");
		326	#endif
		327	#endif
315	fs.addToSearchPath("data");	328	fs.addToSearchPath("data");
		329	fs.addToSearchPath("data" + fs.getDirSeparator() + "rules.zip");
316	}	330	}
317		331
318		332

Return to bug 468766

Lines 24-35 Link Here

(-)blobby-1.0.orig/data/CMakeLists.txt (-1 / +3 lines)
24	${CMAKE_CURRENT_BINARY_DIR}/scripts.zip	24	${CMAKE_CURRENT_BINARY_DIR}/scripts.zip
25	${CMAKE_CURRENT_BINARY_DIR}/backgrounds.zip	25	${CMAKE_CURRENT_BINARY_DIR}/backgrounds.zip
26	${CMAKE_CURRENT_BINARY_DIR}/rules.zip	26	${CMAKE_CURRENT_BINARY_DIR}/rules.zip
		27	Icon.bmp
27	config.xml	28	config.xml
28	inputconfig.xml	29	inputconfig.xml
29	server/server.xml	30	server/server.xml
30	lang_de.xml	31	lang_de.xml
31	lang_en.xml	32	lang_en.xml
32	lang_fr.xml)	33	lang_fr.xml
		34	lang_it.xml)
33		35
34	if (WIN32)	36	if (WIN32)
35	install(FILES ${install_files} DESTINATION data)	37	install(FILES ${install_files} DESTINATION data)

Lines 26-41 Link Here

(-)blobby-1.0.orig/src/main.cpp (-14 / +15 lines)
26		26
27	#include <SDL2/SDL.h>	27	#include <SDL2/SDL.h>
28		28
29	#ifndef __APPLE__	29	#include "Global.h"
30	#ifndef __ANDROID__
31	#include "config.h"
32	#endif
33	#endif
34		30
35	#ifdef __APPLE__	31	#ifdef __APPLE__
36	#if TARGET_OS_IPHONE \|\| TARGET_IPHONE_SIMULATOR	32	#if TARGET_OS_IPHONE \|\| TARGET_IPHONE_SIMULATOR
37	#include <physfs.h>	33	#include <physfs.h>
38	#else	34	#endif
		35	#endif
		36
		37	#if __DESKTOP__
		38	#ifndef WIN32
39	#include "config.h"	39	#include "config.h"
40	#endif	40	#endif
41	#endif	41	#endif
Lines 99-112 Link Here
99	#if defined(WIN32)	99	#if defined(WIN32)
100	// Just write in installation directory	100	// Just write in installation directory
101	fs.setWriteDir("data");	101	fs.setWriteDir("data");
102
103	// handle the case when it is installed
104	fs.addToSearchPath(BLOBBY_INSTALL_PREFIX "/share/blobby");
105	fs.addToSearchPath(BLOBBY_INSTALL_PREFIX "/share/blobby/gfx.zip");
106	fs.addToSearchPath(BLOBBY_INSTALL_PREFIX "/share/blobby/sounds.zip");
107	fs.addToSearchPath(BLOBBY_INSTALL_PREFIX "/share/blobby/scripts.zip");
108	fs.addToSearchPath(BLOBBY_INSTALL_PREFIX "/share/blobby/backgrounds.zip");
109	fs.addToSearchPath(BLOBBY_INSTALL_PREFIX "/share/blobby/rules.zip");
110	#else	102	#else
111	#ifndef __ANDROID__	103	#ifndef __ANDROID__
112	// Create a search path in the home directory and ensure that	104	// Create a search path in the home directory and ensure that
Lines 118-124 Link Here
118	std::string userdir = fs.getUserDir();	110	std::string userdir = fs.getUserDir();
119	#endif	111	#endif
120	#else	112	#else
		113	// Linux
121	std::string userdir = fs.getUserDir();	114	std::string userdir = fs.getUserDir();
		115
		116	// handle the case when it is installed
		117	fs.addToSearchPath(BLOBBY_INSTALL_PREFIX "/share/blobby");
		118	fs.addToSearchPath(BLOBBY_INSTALL_PREFIX "/share/blobby/gfx.zip");
		119	fs.addToSearchPath(BLOBBY_INSTALL_PREFIX "/share/blobby/sounds.zip");
		120	fs.addToSearchPath(BLOBBY_INSTALL_PREFIX "/share/blobby/scripts.zip");
		121	fs.addToSearchPath(BLOBBY_INSTALL_PREFIX "/share/blobby/backgrounds.zip");
		122	fs.addToSearchPath(BLOBBY_INSTALL_PREFIX "/share/blobby/rules.zip");
122	#endif	123	#endif
123	std::string userAppend = ".blobby";	124	std::string userAppend = ".blobby";
124	std::string homedir = userdir + userAppend;	125	std::string homedir = userdir + userAppend;