dekar avatar dekar committed 3dd6caf

Some changes for win7 x64

Comments (0)

Files changed (2)

 if sys.platform == "win32" or mingw:
 	env = Environment(ENV = os.environ,  tools = ['mingw', 'gcc'])
 	env['ENV']['PATH'] = 'c:\\MinGW\\bin;' + os.environ['PATH']
-	r2Path = "c:/my-dev/r2-dr"
+	r2Path = "c:/dev/ee2"
 else:
 	env = Environment()
 	r2Path = "/home/dekar/sandbox/ee2-contest"
                 r2Path + "/prereq/utf8"]
 
 win_libs = ["mingw32",
+                File(r2Path + "/out/libr2.a"),
                 File(r2Path + "/prereq/sdl/lib/libSDLmain.a"),
                 File(r2Path + "/prereq/sdl/lib/libSDL.a"),
                 File(r2Path + "/prereq/sigc++/lib/libsigc-2.0.dll.a"),
-                File(r2Path + "/prereq/devil/lib/libIL.dll.a"),
-                File(r2Path + "/prereq/devil/lib/libILU.dll.a"),
+                File(r2Path + "/prereq/devil/lib/DevIL.lib"),
+                File(r2Path + "/prereq/devil/lib/ILU.lib"),
                 File(r2Path + "/prereq/glew/lib/libglew32.dll.a"),
                 File(r2Path + "/prereq/jsoncpp/src/libjson.a"),
                 File(r2Path + "/prereq/physfs/lib/libphysfs.a"),
                 "winmm",
                 "gdi32",
-                "opengl32",
-                File(r2Path + "/out/libr2.a")]
+                "opengl32"]
 
 win_include = ["include",
                 r2Path + "/include",
 	include  = win_include
 	libs     = win_libs
 	lib_path = win_lib_path
+        env.Append(LINKFLAGS = "--enable-auto-import")
 
 else:
         print "Unknown platform"
 	const char* confName = "g.config.json";
 	
 	fs::setWriteDir(".");
-	fs::addSource("data.zip", true);
-	fs::addSource("data", true);
-
+        LOG("G ok");
+	fs::addSource("data", false);
+	//fs::addSource("data.zip", false);
+        
 	mMainFont = gFontManager->load("data/fonts/arial-unicode.json");
 	
 	Json::Value	config;
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.