diff --git a/AdvancedBallistics.dll b/AdvancedBallistics.dll deleted file mode 100644 index 29b462202d..0000000000 Binary files a/AdvancedBallistics.dll and /dev/null differ diff --git a/ace_advanced_ballistics.dll b/ace_advanced_ballistics.dll new file mode 100644 index 0000000000..568e7c16db Binary files /dev/null and b/ace_advanced_ballistics.dll differ diff --git a/ace_fcs.dll b/ace_fcs.dll index 2cb8b86de2..3385e53463 100644 Binary files a/ace_fcs.dll and b/ace_fcs.dll differ diff --git a/extensions/CMakeLists.txt b/extensions/CMakeLists.txt index f0e21e9207..c50501c770 100644 --- a/extensions/CMakeLists.txt +++ b/extensions/CMakeLists.txt @@ -27,5 +27,6 @@ include_directories(AFTER "common") # Add extensions to build here add_subdirectory(fcs) +add_subdirectory(advanced_ballistics) message("Build Type: ${CMAKE_BUILD_TYPE}") \ No newline at end of file diff --git a/extensions/AdvancedBallistics.cpp b/extensions/advanced_ballistics/AdvancedBallistics.cpp similarity index 99% rename from extensions/AdvancedBallistics.cpp rename to extensions/advanced_ballistics/AdvancedBallistics.cpp index 6d76057c04..44ee7165f5 100644 --- a/extensions/AdvancedBallistics.cpp +++ b/extensions/advanced_ballistics/AdvancedBallistics.cpp @@ -1,4 +1,5 @@ -#include "stdafx.h" +#include "ace_common.h" + #include #include #include diff --git a/extensions/advanced_ballistics/CMakeLists.txt b/extensions/advanced_ballistics/CMakeLists.txt new file mode 100644 index 0000000000..f579339a04 --- /dev/null +++ b/extensions/advanced_ballistics/CMakeLists.txt @@ -0,0 +1,11 @@ +set(ACE_EXTENSION_NAME "ace_advanced_ballistics") + +file(GLOB SOURCES *.h *.hpp *.c *.cpp) +add_library( ${ACE_EXTENSION_NAME} SHARED ${SOURCES}) +add_dependencies(${ACE_EXTENSION_NAME} ace_common) +SET_TARGET_PROPERTIES(${ACE_EXTENSION_NAME} PROPERTIES PREFIX "") + +if(CMAKE_COMPILER_IS_GNUCXX) + set_target_properties(${ACE_EXTENSION_NAME} PROPERTIES LINK_SEARCH_START_STATIC 1) + set_target_properties(${ACE_EXTENSION_NAME} PROPERTIES LINK_SEARCH_END_STATIC 1) +endif() \ No newline at end of file