Optional physfs compile, removed deprectaions.

CMakeLists.txt

@@ -5,14 +5,13 @@ SET(CMAKE_COLOR_MAKEFILE ON)
 project(breakhack C)
 
 include(FindLua)
+include(FindPhysFS)
 include(cmake/FindSDL2.cmake)
 include(cmake/FindSDL2_image.cmake)
 include(cmake/FindSDL2_ttf.cmake)
 include(cmake/FindSDL2_mixer.cmake)
 include(cmake/FindCCache.cmake)
 
-add_subdirectory(physfs-3.0.1)
-
 if (NOT WIN32)
 	include(FindX11)
 	include(cmake/FindCheck.cmake)
@@ -23,8 +22,18 @@ configure_file(
 	"${PROJECT_BINARY_DIR}/config.h"
 	)
 
+if (NOT PHYSFS_FOUND)
+	add_subdirectory(physfs-3.0.1)
+	include_directories(
+		physfs-3.0.1
+		)
+else (NOT PHYSFS_FOUND)
+	include_directories(
+		${PHYSFS_INCLUDE_DIR}
+		)
+endif (NOT PHYSFS_FOUND)
+
 include_directories(
-	physfs-3.0.1/src
 	${PROJECT_BINARY_DIR}
 	${LUA_INCLUDE_DIR}
 	${SDL2_INCLUDE_DIR}
@@ -87,7 +96,6 @@ add_executable(breakhack
 	)
 
 target_link_libraries(breakhack
-	physfs
 	${LUA_LIBRARY}
 	${SDL2_LIBRARY}
 	${SDL2_IMAGE_LIBRARY}
@@ -95,6 +103,16 @@ target_link_libraries(breakhack
 	${SDL2_MIXER_LIBRARY}
 	)
 
+if (NOT PHYSFS_FOUND)
+	target_link_libraries(breakhack
+		physfs
+		)
+else (NOT PHYSFS_FOUND)
+	target_link_libraries(breakhack
+		${PHYSFS_LIBRARY}
+		)
+endif (NOT PHYSFS_FOUND)
+
 if (NOT WIN32)
 	target_link_libraries(breakhack
 		${X11_LIBRARIES}

src/io_util.c

@@ -6,8 +6,10 @@
 SDL_RWops *
 io_load_rwops(const char *path)
 {
-	if (!PHYSFS_exists(path))
+	if (!PHYSFS_exists(path)) {
-		fatal("Unable to open file %s: %s", path, PHYSFS_getLastError());
+		PHYSFS_ErrorCode code = PHYSFS_getLastErrorCode();
+		fatal("Unable to open file %s: (%d) %s", path, code, PHYSFS_getErrorByCode(code));
+	}
 
 	return PHYSFSRWOPS_openRead(path);
 }

src/main.c

@@ -613,7 +613,7 @@ int main(int argc, char *argv[])
 	UNUSED(argc);
 
 	PHYSFS_init(argv[0]);
-	PHYSFS_addToSearchPath("assets", 0);
+	PHYSFS_mount("assets", NULL, 0);
 
 	if (!init())
 		return 1;

src/physfsrwops.c

@@ -37,6 +37,12 @@
 #define RW_SEEK_END SEEK_END
 #endif
 
+static const char *getLastPhysfsError(void)
+{
+	const PHYSFS_ErrorCode err = PHYSFS_getLastErrorCode();
+	return (err) ? PHYSFS_getErrorByCode(err) : NULL;
+}
+
 #if TARGET_SDL2
 static Sint64 SDLCALL physfsrwops_size(struct SDL_RWops *rw)
 {
@@ -63,18 +69,19 @@ static int physfsrwops_seek(SDL_RWops *rw, int offset, int whence)
 		const PHYSFS_sint64 current = PHYSFS_tell(handle);
 		if (current == -1)
 		{
+
 			SDL_SetError("Can't find position in file: %s",
-                          PHYSFS_getLastError());
+				     getLastPhysfsError());
 			return -1;
 		} /* if */
 
 		if (offset == 0)  /* this is a "tell" call. We're done. */
 		{
-            #if TARGET_SDL2
+#if TARGET_SDL2
 			return (Sint64) current;
-            #else
+#else
 			return (int) current;
-            #endif
+#endif
 		} /* if */
 
 		pos = current + ((PHYSFS_sint64) offset);
@@ -85,7 +92,7 @@ static int physfsrwops_seek(SDL_RWops *rw, int offset, int whence)
 		const PHYSFS_sint64 len = PHYSFS_fileLength(handle);
 		if (len == -1)
 		{
-            SDL_SetError("Can't find end of file: %s", PHYSFS_getLastError());
+			SDL_SetError("Can't find end of file: %s", getLastPhysfsError());
 			return -1;
 		} /* if */
 
@@ -106,15 +113,15 @@ static int physfsrwops_seek(SDL_RWops *rw, int offset, int whence)
 
 	if (!PHYSFS_seek(handle, (PHYSFS_uint64) pos))
 	{
-        SDL_SetError("PhysicsFS error: %s", PHYSFS_getLastError());
+		SDL_SetError("PhysicsFS error: %s", getLastPhysfsError());
 		return -1;
 	} /* if */
 
-    #if TARGET_SDL2
+#if TARGET_SDL2
 	return (Sint64) pos;
-    #else
+#else
 	return (int) pos;
-    #endif
+#endif
 } /* physfsrwops_seek */
 
 
@@ -132,21 +139,21 @@ static int physfsrwops_read(SDL_RWops *rw, void *ptr, int size, int maxnum)
 	{
 		if (!PHYSFS_eof(handle)) /* not EOF? Must be an error. */
 		{
-            SDL_SetError("PhysicsFS error: %s", PHYSFS_getLastError());
+			SDL_SetError("PhysicsFS error: %s", getLastPhysfsError());
 
-            #if TARGET_SDL2
+#if TARGET_SDL2
 			return 0;
-            #else
+#else
 			return -1;
-            #endif
+#endif
 		} /* if */
 	} /* if */
 
-    #if TARGET_SDL2
+#if TARGET_SDL2
 	return (size_t) rc / size;
-    #else
+#else
 	return (int) rc / size;
-    #endif
+#endif
 } /* physfsrwops_read */
 
 
@@ -161,22 +168,21 @@ static int physfsrwops_write(SDL_RWops *rw, const void *ptr, int size, int num)
 	const PHYSFS_uint64 writelen = (PHYSFS_uint64) (num * size);
 	const PHYSFS_sint64 rc = PHYSFS_writeBytes(handle, ptr, writelen);
 	if (rc != ((PHYSFS_sint64) writelen))
-        SDL_SetError("PhysicsFS error: %s", PHYSFS_getLastError());
+		SDL_SetError("PhysicsFS error: %s", getLastPhysfsError());
 
-    #if TARGET_SDL2
+#if TARGET_SDL2
 	return (size_t) rc;
-    #else
+#else
 	return (int) rc;
-    #endif
+#endif
 } /* physfsrwops_write */
 
-
 static int physfsrwops_close(SDL_RWops *rw)
 {
 	PHYSFS_File *handle = (PHYSFS_File *) rw->hidden.unknown.data1;
 	if (!PHYSFS_close(handle))
 	{
-        SDL_SetError("PhysicsFS error: %s", PHYSFS_getLastError());
+		SDL_SetError("PhysicsFS error: %s", getLastPhysfsError());
 		return -1;
 	} /* if */
 
@@ -190,15 +196,15 @@ static SDL_RWops *create_rwops(PHYSFS_File *handle)
 	SDL_RWops *retval = NULL;
 
 	if (handle == NULL)
-        SDL_SetError("PhysicsFS error: %s", PHYSFS_getLastError());
+		SDL_SetError("PhysicsFS error: %s", getLastPhysfsError());
 	else
 	{
 		retval = SDL_AllocRW();
 		if (retval != NULL)
 		{
-            #if TARGET_SDL2
+#if TARGET_SDL2
 			retval->size  = physfsrwops_size;
-            #endif
+#endif
 			retval->seek  = physfsrwops_seek;
 			retval->read  = physfsrwops_read;
 			retval->write = physfsrwops_write;