Fix compilation for linux and improved build path

Author: SimoSbara

CMakeLists.txt

@@ -18,9 +18,9 @@ set(DFF_CONVERTER_INSTALL_INCLUDE_DIR ${PROJECT_SOURCE_DIR}/include)
 set(DFF_CONVERTER_INSTALL_BIN_DIR ${PROJECT_SOURCE_DIR}/bin)
 
 set(DFF_CONVERTER_BASE_INSTALL_DIR ${DFF_CONVERTER_INSTALL_BIN_DIR}/x${OSBit}/${CMAKE_BUILD_TYPE})
-set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${DFF_CONVERTER_BASE_INSTALL_DIR}/libs)
-set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${DFF_CONVERTER_BASE_INSTALL_DIR}/lib)
-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${DFF_CONVERTER_BASE_INSTALL_DIR}/runtime)
+set(DFF_CONVERTER_INCLUDE_OUTPUT_DIRECTORY ${DFF_CONVERTER_BASE_INSTALL_DIR}/include)
+set(DFF_CONVERTER_LIBRARY_OUTPUT_DIRECTORY ${DFF_CONVERTER_BASE_INSTALL_DIR}/libs)
+set(DFF_CONVERTER_RUNTIME_OUTPUT_DIRECTORY ${DFF_CONVERTER_BASE_INSTALL_DIR}/runtime)
 
 set(DFF_CONVERTER_HEADERS_DIR 
 	${PROJECT_SOURCE_DIR}/src/converter

src/CMakeLists.txt

@@ -22,7 +22,19 @@ add_library(dff_converter_static STATIC
 
 add_executable(dff_conv ${SOURCE_FILES})
 
+set_target_properties(dff_converter PROPERTIES PUBLIC_HEADER "${CMAKE_INSTALL_PREFIX}/externals/tinygltf/tiny_gltf.h;converter/Converter.h;converter/ConverterGLTF.h;rwtools/renderware.h")
+set_target_properties(dff_converter_static PROPERTIES PUBLIC_HEADER "${CMAKE_INSTALL_PREFIX}/externals/tinygltf/tiny_gltf.h;converter/Converter.h;converter/ConverterGLTF.h;rwtools/renderware.h")
+
+
 target_link_libraries(dff_conv dff_converter)
 target_link_libraries(dff_conv dff_converter_static)
 
-install(TARGETS dff_conv DESTINATION ${DFF_CONVERTER_INSTALL_BIN_DIR}/x${OSBit}/${CMAKE_BUILD_TYPE})
+install(TARGETS dff_conv DESTINATION ${DFF_CONVERTER_RUNTIME_OUTPUT_DIRECTORY})
+install(TARGETS dff_converter 
+        DESTINATION ${DFF_CONVERTER_LIBRARY_OUTPUT_DIRECTORY}
+        PUBLIC_HEADER DESTINATION ${DFF_CONVERTER_INCLUDE_OUTPUT_DIRECTORY}
+)
+install(TARGETS dff_converter_static 
+        DESTINATION ${DFF_CONVERTER_LIBRARY_OUTPUT_DIRECTORY}
+        PUBLIC_HEADER DESTINATION ${DFF_CONVERTER_INCLUDE_OUTPUT_DIRECTORY}
+)

src/converter/ConverterGLTF.cpp

@@ -431,7 +431,9 @@ int ConverterGLTF::insertIndices(std::vector<BYTE>& buffer, rw::Split* split, in
 
 bool ConverterGLTF::convert(char* output, rw::Clump& dff)
 {
-    return convert(output, dff, rw::TextureDictionary());
+    rw::TextureDictionary emptyTXD;
+
+    return convert(output, dff, emptyTXD);
 }
 
 bool ConverterGLTF::convert(char* output, rw::Clump& dff, rw::TextureDictionary& txd)
@@ -551,4 +553,4 @@ bool ConverterGLTF::convert(char* output, rw::Clump& dff, rw::TextureDictionary&
         false); // write binary
 
 	return true;
-}
+}