rendered paste bodyIndex: src/SDL_rwops_zzip.c
===================================================================
--- src/SDL_rwops_zzip.c (revision 22)
+++ src/SDL_rwops_zzip.c (working copy)
@@ -25,10 +25,10 @@
return zzip_read(SDL_RWOPS_ZZIP_FILE(context), ptr, size*maxnum);
}
-static int _zzip_write(SDL_RWops *context, const void *ptr, int size, int num)
-{
- return 0; /* ignored */
-}
+//!static int _zzip_write(SDL_RWops *context, const void *ptr, int size, int num)
+//!{
+//! return 0; /* ignored */
+//!}
static int _zzip_close(SDL_RWops *context)
{
@@ -60,7 +60,7 @@
SDL_RWOPS_ZZIP_DATA(rwops) = zzip_file;
// rwops->read = _zzip_read;
rwops->read = _sdl_zzip_read;
- rwops->write = _zzip_write;
+//! rwops->write = _zzip_write;
rwops->seek = _zzip_seek;
rwops->close = _zzip_close;
return rwops;
Index: SConstruct
===================================================================
--- SConstruct (revision 22)
+++ SConstruct (working copy)
@@ -1,4 +1,5 @@
import sys
+import os
opts = Options('config.py')
# default to using sdl-config if not on windows
@@ -6,10 +7,10 @@
opts.Add('SDL_LIB_PATH', 'lib path for SDL', '')
opts.Add('ZLIB_INCLUDE_PATH', 'include path for zlib', '')
opts.Add('ZLIB_LIB_PATH', 'lib path for zlib', '')
-opts.Add('ZZIP_INCLUDE_PATH', 'include path for zlib', '')
-opts.Add('ZZIP_LIB_PATH', 'lib path for zlib', '')
+opts.Add('ZZIP_INCLUDE_PATH', 'include path for zzib', '')
+opts.Add('ZZIP_LIB_PATH', 'lib path for zzib', '')
-env = Environment(options = opts )
+env = Environment(options = opts, ENV=os.environ)
env.Append(CPPPATH="#include")
@@ -22,11 +23,12 @@
env.Append(CCFLAGS=["-ggdb"])
else:
env.Append(LIBS = ["zziplib", "zdll", "SDLmain"])
+# env.Append(LIBS = ["zdll", "SDLmain"])
env.Append(LINKFLAGS = ["/SUBSYSTEM:CONSOLE"])
- env.Append(CCFLAGS = ["/MD", "/Ox"])
+ env.Append(CCFLAGS = ["/MD", "/O2"])
env.Append(LIBS = [ "SDL",
- "SDL_mixer",
+ "SDL_mixer",
"SDL_image",
"SDL_net",
"SDL_ttf",
Index: config.py
===================================================================
--- config.py (revision 22)
+++ config.py (working copy)
@@ -1,6 +1,6 @@
-SDL_INCLUDE_PATH = r"E:\projects\include\SDL\SDL-1.2.11\include"
-SDL_LIB_PATH = r"E:\projects\include\SDL\SDL-1.2.11\lib"
-ZLIB_INCLUDE_PATH = r"E:\projects\include\zlib123-dll\include"
-ZLIB_LIB_PATH = r"E:\projects\include\zlib123-dll\lib"
-ZZIP_INCLUDE_PATH = "E:\projects\include\zziplib-0.10.82-msvc6-lib\include"
-ZZIP_LIB_PATH = "E:\projects\include\zziplib-0.10.82-msvc6-lib\lib"
+SDL_INCLUDE_PATH = r"C:\cygwin\home\Zyrill\dunelegacy\include\SDL\include"
+SDL_LIB_PATH = r"C:\cygwin\home\Zyrill\dunelegacy\include\SDL\lib"
+ZLIB_INCLUDE_PATH = r"C:\cygwin\home\Zyrill\dunelegacy\include\zlib\include"
+ZLIB_LIB_PATH = r"C:\cygwin\home\Zyrill\dunelegacy\include\zlib\lib"
+ZZIP_INCLUDE_PATH = "C:\cygwin\home\Zyrill\dunelegacy\include\zzip\include"
+ZZIP_LIB_PATH = "C:\cygwin\home\Zyrill\dunelegacy\include\zzip\lib"