hum

git-svn-id: http://svn.net-core.org/repos/t-engine4@5826 51575b47-30f0-44d4-a5cc-537603b46e54

build/options.lua

@@ -52,4 +52,9 @@ newoption {
 	description = "Doesnt remove jit2 build files",
 }
 
+newoption {
+	trigger	    = "no_rwops_size",
+	description = "Compat for old SDL2 dev verions"
+}
+
 _OPTIONS.lua = _OPTIONS.lua or "jit2"

build/te4core.lua

@@ -28,6 +28,8 @@ project "TEngine"
 
 	links { "m" }
 
+	if _OPTIONS.no_rwops_size then defines{"NO_RWOPS_SIZE"} end
+
 	configuration "macosx"
 		files { "../src/mac/SDL*" }
 		includedirs {
@@ -57,7 +59,7 @@ project "TEngine"
 
 
 	configuration "linux"
-		libdirs {"/home/nicolas/local/lib/"}
+		libdirs {"/opt/SDL-2.0/lib/"}
 		links { "dl", "SDL2", "SDL2_ttf", "SDL2_image", "png", "openal", "vorbisfile", "GL", "GLU", "m", "pthread" }
 		defines { [[TENGINE_HOME_PATH='".t-engine"']], 'SELFEXE_LINUX' }
 
@@ -78,6 +80,7 @@ project "physfs"
 	targetname "physfs"
 
 	defines {"PHYSFS_SUPPORTS_ZIP"}
+	if _OPTIONS.no_rwops_size then defines{"NO_RWOPS_SIZE"} end
 
 	files { "../src/physfs/*.c", "../src/physfs/zlib123/*.c", "../src/physfs/archivers/*.c", }
 

premake4.lua

@@ -18,7 +18,7 @@ solution "TEngine"
 		"src/physfs",
 		"src/physfs/zlib123",
 		"src/bzip2",
-		"/home/nicolas/local/include/SDL2/",
+		"/opt/SDL-2.0/include/SDL2",
 		"/usr/include/GL",
 	}
 	if _OPTIONS.lua == "default" then includedirs{"src/lua"}

src/physfs/physfsrwops.c

@@ -156,7 +156,9 @@ static SDL_RWops *create_rwops(PHYSFS_File *handle)
             retval->read  = physfsrwops_read;
             retval->write = physfsrwops_write;
             retval->close = physfsrwops_close;
+#ifndef NO_RWOPS_SIZE
             retval->size  = physfsrwops_size;
+#endif
             retval->hidden.unknown.data1 = handle;
         } /* if */
     } /* else */