add pkg-config and cmake config files, fix some compiler warnings and remove libs3util submodule

Author: paulwedeck

.gitmodules

@@ -1,36 +1,46 @@
 cmake_minimum_required(VERSION 3.2.2)
-project(libs3dat)
+project(libs3dat VERSION 1.0.0)
 
 option(PRIVATE_FILENAME "stop leaking complete path to file (should be enabled on distribution)" ON)
 
-add_subdirectory(libs3util)
-
-include(CPack)
 include(CTest)
 include(TestBigEndian)
+include(CMakePackageConfigHelpers)
 
 set(CMAKE_C_FLAGS "-Wall")
 set(CMAKE_C_STANDARD 11)
 set(CMAKE_C_STANDARD_REQUIRED ON)
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib")
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY  "${CMAKE_BINARY_DIR}/bin")
 set(CPACK_PACKAGE_NAME "libs3dat")
+set(CPACK_PACKAGE_VERSION ${libs3dat_VERSION})
+set(CPACK_PACKAGE_VERSION_MAJOR ${libs3dat_VERSION_MAJOR})
+set(CPACK_PACKAGE_VERSION_MINOR ${libs3dat_VERSION_MINOR})
+set(CPACK_PACKAGE_VERSION_PATCH ${libs3dat_VERSION_PATCH})
+set(CPACK_RESOURCE_FILE_LICENSE ${CMAKE_CURRENT_SOURCE_DIR}/LICENSE)
+set(CPACK_PACKAGING_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX})
+set(CPACK_DEBIAN_PACKAGE_DEPENDS "libs3util (=1.0.0)")
+include(CPack)
 
 set(STRING_BUFFER 1024)
 
 TEST_BIG_ENDIAN(IS_BE)
 
+find_package(s3util REQUIRED)
+
 
 configure_file(config.h.in ${PROJECT_BINARY_DIR}/config.s3dat.h)
+configure_file(libs3dat.pc.in ${PROJECT_BINARY_DIR}/libs3dat.pc @ONLY)
 
-include_directories(src ${PROJECT_BINARY_DIR} libs3util/src)
+include_directories(src ${PROJECT_BINARY_DIR} ${s3util_INCLUDE_DIRS})
 
 
 #s3dat
 file(GLOB_RECURSE s3dat_SOURCES "src/*.[ch]")
 
 add_library(s3dat SHARED ${s3dat_SOURCES})
 target_link_libraries(s3dat s3util)
+target_include_directories(s3dat PUBLIC $<INSTALL_INTERFACE:include>)
 
 add_executable(cli cli.c)
 target_link_libraries(cli s3dat)
@@ -62,8 +72,19 @@ if(glfw3_FOUND AND OpenGL_FOUND)
 	target_include_directories(walk PUBLIC ${OPENGL_INCLUDE_DIRS} ${glfw3_INCLUDE_DIRS})
 endif()
 
-install(TARGETS s3dat DESTINATION lib)
+write_basic_package_version_file(${PROJECT_BINARY_DIR}/s3datConfigVersion.cmake COMPATIBILITY ExactVersion)
+configure_package_config_file(s3datConfig.cmake.in s3datConfig.cmake INSTALL_DESTINATION lib/cmake/s3dat PATH_VARS CMAKE_INSTALL_PREFIX PROJECT_BINARY_DIR)
+
+install(TARGETS s3dat EXPORT s3datTarget DESTINATION lib)
+install(EXPORT s3datTarget DESTINATION lib/cmake/s3dat)
+
+#for find_package on build dirs
+export(TARGETS s3dat FILE s3datTarget.cmake)
+
 install(FILES src/s3dat_ext.h src/s3dat.h DESTINATION include/s3dat)
+install(FILES ${PROJECT_BINARY_DIR}/libs3dat.pc DESTINATION lib/pkgconfig)
+install(FILES ${PROJECT_BINARY_DIR}/s3datConfigVersion.cmake ${PROJECT_BINARY_DIR}/s3datConfig.cmake DESTINATION lib/cmake/s3dat)
+install(FILES LICENSE DESTINATION share/doc/libs3dat)
 
 add_executable(testme test.c)
 target_link_libraries(testme s3dat)

CMakeLists.txt

@@ -113,8 +113,8 @@ int main(int argc, char** argv) {
 	uint32_t file = ani_len > 0 ? s3dat_frame(ani, 0)->settler_file : 0;
 
 
-	char img_name[31];
-	snprintf(img_name, 30, "GFX/Siedler3_%.2i.f8007e01f.dat", file);
+	char img_name[34];
+	snprintf(img_name, 34, "GFX/Siedler3_%.2i.f8007e01f.dat", file);
 	img_gfx = s3dat_new_malloc();
 	s3dat_readfile_name(img_gfx, img_name, &ex);
 	s3util_catch_exception(&ex);

animation.c

@@ -0,0 +1,11 @@
+prefix=@CMAKE_INSTALL_PREFIX@
+exec_prefix=${prefix}
+Requires: libs3util
+includedir=${prefix}/include
+libdir=${prefix}/lib
+
+Name: libs3dat
+Description: A library that reads and writes dat files
+Version: @PROJECT_VERSION@
+Cflags: -I${includedir}/s3dat
+Libs: -L${libdir} -ls3dat

libs3dat.pc.in

@@ -0,0 +1,7 @@
+@PACKAGE_INIT@
+
+include(${CMAKE_CURRENT_LIST_DIR}/s3datTarget.cmake)
+
+if(NOT DEFINED s3dat_INCLUDE_DIRS)
+set(s3dat_INCLUDE_DIRS ${PROJECT_BINARY_DIR}/src)
+endif()

libs3util

@@ -58,7 +58,7 @@ void s3dat_read_packed_handler(s3dat_extracthandler_t* me, s3dat_res_t* res, s3u
 		return;
 	}
 
-	uint32_t raw_len;
+	uint32_t raw_len = 0;
 	uint32_t read_len;
 	void* data;
 

s3datConfig.cmake.in

@@ -186,8 +186,8 @@ void s3dat_readfile(s3dat_t* handle, s3util_exception_t** throws) {
 	}
 }
 
-void s3dat_internal_read_index(s3dat_t* handle, uint32_t index, s3util_exception_t** throws) {
-	s3dat_internal_seek_func(handle, index, S3UTIL_SEEK_SET, throws);
+void s3dat_internal_read_index(s3dat_t* handle, uint32_t index_pos, s3util_exception_t** throws) {
+	s3dat_internal_seek_func(handle, index_pos, S3UTIL_SEEK_SET, throws);
 	S3UTIL_HANDLE_EXCEPTION(s3dat_memset(handle), throws, __FILE__, __func__, __LINE__);
 
 	uint32_t index_type = S3DAT_INTERNAL_READ(32LE, handle, throws);
@@ -271,7 +271,7 @@ void s3dat_internal_read_index(s3dat_t* handle, uint32_t index, s3util_exception
 		}
 
 		if(index_type == s3dat_settler || index_type == s3dat_torso || index_type == s3dat_shadow) {
-			s3dat_seq_index_t* index;
+			s3dat_seq_index_t* index = NULL;
 			switch(index_type) {
 				case s3dat_settler:
 					index = handle->settler_index;
@@ -326,7 +326,7 @@ void s3dat_internal_read_index(s3dat_t* handle, uint32_t index, s3util_exception
 			index->len = index_len;
 			index->sequences = indices;
 		} else {
-			s3dat_index_t* index;
+			s3dat_index_t* index = NULL;
 			switch(index_type) {
 				case s3dat_gui:
 					index = handle->gui_index;