Skip to content

Commit 0133151

Browse files
committed
Add release versions of NavWeakness lib and dll
1 parent 1bc754e commit 0133151

File tree

9 files changed

+28
-15
lines changed

9 files changed

+28
-15
lines changed
File renamed without changes.
File renamed without changes.

lib/Release/NavWeakness.dll

459 KB
Binary file not shown.

lib/Release/NavWeakness.lib

3.66 KB
Binary file not shown.

src/CMakeLists.txt

Lines changed: 28 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -31,37 +31,50 @@ target_link_libraries(NavKit PRIVATE NavWeakness)
3131
target_link_libraries(NavKit PRIVATE ResourceLib_HM3)
3232

3333
file(COPY "${NavKit_SOURCE_DIR}/src/resource/DroidSans.ttf" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}")
34-
file(COPY "${NavKit_SOURCE_DIR}/bin/NavWeakness.dll" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}")
35-
file(COPY "${NavKit_SOURCE_DIR}/bin/ResourceLib_HM3.dll" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}")
34+
35+
if(CMAKE_BUILD_TYPE STREQUAL "Debug")
36+
set(NAV_WEAKNESS_DLL "${NavKit_SOURCE_DIR}/lib/Debug/NavWeakness.dll")
37+
elseif(CMAKE_BUILD_TYPE STREQUAL "Release")
38+
set(NAV_WEAKNESS_DLL "${NavKit_SOURCE_DIR}/lib/Release/NavWeakness.dll")
39+
endif()
40+
add_custom_command(
41+
TARGET NavKit
42+
POST_BUILD
43+
COMMAND ${CMAKE_COMMAND} -E copy_if_different "${NAV_WEAKNESS_DLL}" "${CMAKE_CURRENT_BINARY_DIR}/"
44+
COMMENT "Copying ${NAV_WEAKNESS_DLL} to ${CMAKE_BINARY_DIR}"
45+
)
46+
47+
48+
file(COPY "${NavKit_SOURCE_DIR}/lib/Debug/ResourceLib_HM3.dll" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}")
3649
file(COPY "${NavKit_SOURCE_DIR}/bin/Glacier2Obj.exe" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}")
3750
file(COPY "${NavKit_SOURCE_DIR}/src/resource/Glacier2Obj.py" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}")
3851
file(COPY "${NavKit_SOURCE_DIR}/bin/Editor.dll" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}")
39-
file(COPY "${NavKit_SOURCE_DIR}/bin/nfd.dll" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}")
52+
file(COPY "${NavKit_SOURCE_DIR}/lib/Debug/nfd.dll" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}")
4053
file(COPY "${NavKit_SOURCE_DIR}/src/resource/NavKit.ini" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}")
4154

4255
set_target_properties(NavWeakness PROPERTIES
4356
IMPORTED_LINK_INTERFACE_LANGUAGES_DEBUG "CXX"
4457
IMPORTED_LOCATION "${CMAKE_BINARY_DIR}/NavWeakness.dll"
45-
IMPORTED_IMPLIB_DEBUG "${NavKit_SOURCE_DIR}/include/NavWeakness/NavWeakness.lib"
46-
IMPORTED_IMPLIB_RELEASE "${NavKit_SOURCE_DIR}/include/NavWeakness/NavWeakness.lib"
47-
IMPORTED_LOCATION_DEBUG "${NavKit_SOURCE_DIR}/bin/NavWeakness.dll"
48-
IMPORTED_LOCATION_RELEASE "${NavKit_SOURCE_DIR}/bin/NavWeakness.dll"
58+
IMPORTED_IMPLIB_DEBUG "${NavKit_SOURCE_DIR}/lib/Debug/NavWeakness.lib"
59+
IMPORTED_IMPLIB_RELEASE "${NavKit_SOURCE_DIR}/lib/Release/NavWeakness.lib"
60+
IMPORTED_LOCATION_DEBUG "${NavKit_SOURCE_DIR}/lib/Debug/NavWeakness.dll"
61+
IMPORTED_LOCATION_RELEASE "${NavKit_SOURCE_DIR}/lib/Release/NavWeakness.dll"
4962
)
5063
set_target_properties(nfd::nfd PROPERTIES
5164
NFD_OVERRIDE_RECENT_WITH_DEFAULT ON
5265
IMPORTED_LINK_INTERFACE_LANGUAGES_DEBUG "CXX"
5366
IMPORTED_LOCATION "${CMAKE_BINARY_DIR}/nfd.dll"
54-
IMPORTED_IMPLIB_DEBUG "${NavKit_SOURCE_DIR}/include/nativefiledialog-extended/nfd.lib"
55-
IMPORTED_IMPLIB_RELEASE "${NavKit_SOURCE_DIR}/include/nativefiledialog-extended/nfd.lib"
56-
IMPORTED_LOCATION_DEBUG "${NavKit_SOURCE_DIR}/bin/nfd.dll"
57-
IMPORTED_LOCATION_RELEASE "${NavKit_SOURCE_DIR}/bin/nfd.dll"
67+
IMPORTED_IMPLIB_DEBUG "${NavKit_SOURCE_DIR}/lib/Debug/nfd.lib"
68+
IMPORTED_IMPLIB_RELEASE "${NavKit_SOURCE_DIR}/lib/Debug/nfd.lib"
69+
IMPORTED_LOCATION_DEBUG "${NavKit_SOURCE_DIR}/lib/Debug/nfd.dll"
70+
IMPORTED_LOCATION_RELEASE "${NavKit_SOURCE_DIR}/lib/Debug/nfd.dll"
5871
)
5972
set_target_properties(ResourceLib_HM3 PROPERTIES
6073
IMPORTED_LOCATION "${CMAKE_BINARY_DIR}/ResourceLib_HM3.dll"
61-
IMPORTED_IMPLIB_DEBUG "${NavKit_SOURCE_DIR}/include/ResourceLib_HM3/ResourceLib_HM3.lib"
62-
IMPORTED_IMPLIB_RELEASE "${NavKit_SOURCE_DIR}/include/ResourceLib_HM3/ResourceLib_HM3.lib"
63-
IMPORTED_LOCATION_DEBUG "${NavKit_SOURCE_DIR}/bin/ResourceLib_HM3.dll"
64-
IMPORTED_LOCATION_RELEASE "${NavKit_SOURCE_DIR}/bin/ResourceLib_HM3.dll"
74+
IMPORTED_IMPLIB_DEBUG "${NavKit_SOURCE_DIR}/lib/Debug/ResourceLib_HM3.lib"
75+
IMPORTED_IMPLIB_RELEASE "${NavKit_SOURCE_DIR}/lib/Debug/ResourceLib_HM3.lib"
76+
IMPORTED_LOCATION_DEBUG "${NavKit_SOURCE_DIR}/lib/Debug/ResourceLib_HM3.dll"
77+
IMPORTED_LOCATION_RELEASE "${NavKit_SOURCE_DIR}/lib/Debug/ResourceLib_HM3.dll"
6578
)
6679

6780
target_link_libraries(NavKit

0 commit comments

Comments
 (0)