diff --git a/dep b/dep index a76c985e0..8889f5fdc 160000 --- a/dep +++ b/dep @@ -1 +1 @@ -Subproject commit a76c985e0ca019fbc86ec31799fb57fd20e90c78 +Subproject commit 8889f5fdcb1ec1fea89913a98b10d38fd26919ca diff --git a/src/tools/Extractor_projects/map-extractor/CMakeLists.txt b/src/tools/Extractor_projects/map-extractor/CMakeLists.txt index 2a8d45a66..a40015196 100644 --- a/src/tools/Extractor_projects/map-extractor/CMakeLists.txt +++ b/src/tools/Extractor_projects/map-extractor/CMakeLists.txt @@ -38,7 +38,7 @@ set(SOURCES add_executable(${EXECUTABLE_NAME} dbcfile.cpp System.cpp ${SOURCES} ${EXECUTABLE_SRCS}) -target_link_libraries(${EXECUTABLE_NAME} loadlib StormLib) +target_link_libraries(${EXECUTABLE_NAME} loadlib storm) #Output the compiled exes to build/bin/$(Configuration)/tools directory on windows by default if(WIN32) diff --git a/src/tools/Extractor_projects/map-extractor/dbcfile.h b/src/tools/Extractor_projects/map-extractor/dbcfile.h index 4d596972a..9136898c3 100644 --- a/src/tools/Extractor_projects/map-extractor/dbcfile.h +++ b/src/tools/Extractor_projects/map-extractor/dbcfile.h @@ -27,11 +27,6 @@ #include #include - -#ifdef _DLL -#undef _DLL -#endif - #include "StormLib.h" /** diff --git a/src/tools/Extractor_projects/vmap-extractor/CMakeLists.txt b/src/tools/Extractor_projects/vmap-extractor/CMakeLists.txt index b63365c76..fe34345cf 100644 --- a/src/tools/Extractor_projects/vmap-extractor/CMakeLists.txt +++ b/src/tools/Extractor_projects/vmap-extractor/CMakeLists.txt @@ -43,7 +43,7 @@ add_executable(${EXECUTABLE_NAME} ${EXECUTABLE_SRCS} ${CMAKE_SOURCE_DIR}/src/tools/Extractor_projects/shared/ExtractorCommon.cpp ) -target_link_libraries(${EXECUTABLE_NAME} loadlib bzip2 zlib StormLib) +target_link_libraries(${EXECUTABLE_NAME} loadlib bzip2 zlib storm) #Output the compiled exes to build/bin/$(Configuration)/tools directory on windows by default if(WIN32)