Bladeren bron

Deleted unused 3rd-party libraries. Moved used 3rd-party libraries to their lib directory

Ivan Arkhipov 6 jaren geleden
bovenliggende
commit
52206c031d

+ 8 - 8
CMakeLists.txt

@@ -80,13 +80,13 @@ add_executable(LotRO_dat_extract_tester ${SOURCE_FILES} ${HEADER_FILES} ${CMAKE_
 add_executable(LotRO_dat_pat_tester ${SOURCE_FILES} ${HEADER_FILES} ${CMAKE_SOURCE_DIR}/src/Examples/patcher_example.cpp)
 
 foreach(TARGET LotroDat_static LotroDat LotRO_dat_extract_tester LotRO_dat_pat_tester)
-    if(MSVC)
-        target_link_libraries(${TARGET} ${CMAKE_SOURCE_DIR}/Third_Party/Zlib/zlibstatic.lib)
-        target_link_libraries(${TARGET} ${CMAKE_SOURCE_DIR}/Third_Party/Yaml-cpp/libyaml-cppmt.lib)
-        target_link_libraries(${TARGET} vcruntime.lib MSVCRT.lib)
-    else(MSVC)
-        target_link_libraries(${TARGET} ${CMAKE_SOURCE_DIR}/Third_Party/Zlib/libzlibstatic.a)
-        target_link_libraries(${TARGET} ${CMAKE_SOURCE_DIR}/Third_Party/Yaml-cpp/libyaml-cpp.a)
+    #if(MSVC)
+    #    target_link_libraries(${TARGET} ${CMAKE_SOURCE_DIR}/Third_Party/Zlib/zlibstatic.lib)
+    #    target_link_libraries(${TARGET} ${CMAKE_SOURCE_DIR}/Third_Party/Yaml-cpp/libyaml-cppmt.lib)
+    #    target_link_libraries(${TARGET} vcruntime.lib MSVCRT.lib)
+    #else(MSVC)
+        target_link_libraries(${TARGET} ${CMAKE_SOURCE_DIR}/Third_Party/Zlib/lib/libzlibstatic.a)
+        target_link_libraries(${TARGET} ${CMAKE_SOURCE_DIR}/Third_Party/Yaml-cpp/lib/libyaml-cpp.a)
         target_link_libraries(${TARGET} -static-libgcc -static-libstdc++ -Wl,-Bstatic -lstdc++ -lpthread -Wl,-Bdynamic)
-    endif(MSVC)
+    #endif(MSVC)
 endforeach(TARGET LotroDat_static LotroDat LotRO_dat_extract_tester LotRO_dat_pat_tester)

+ 0 - 0
Third_party/ZLib/libzlibstatic.a → Third_party/ZLib/lib/libzlibstatic.a


BIN
Third_party/ZLib/zlibstatic.lib


+ 0 - 0
Third_party/yaml-cpp/libyaml-cpp.a → Third_party/yaml-cpp/lib/libyaml-cpp.a


BIN
Third_party/yaml-cpp/libyaml-cppmt.lib


BIN
Third_party/yaml-cpp/libyaml-cppmtd.lib


BIN
lib/libLotroDat.dll.a