Go full in on ADS submodule

loupeteam · Feb 15, 2024 · f91c7ce · f91c7ce
1 parent d60365c
commit f91c7ce
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 15 deletions.
diff --git a/src/LuxServer/CMakeLists.txt b/src/LuxServer/CMakeLists.txt
@@ -26,6 +26,9 @@ project(luxserver)
 
 include_directories(PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include)
 
+add_definitions(-DNOMINMAX)
+
 add_subdirectory(src)
+add_subdirectory(depends/ADS)
 
 
diff --git a/src/LuxServer/include/AdsExtension.h b/src/LuxServer/include/AdsExtension.h
@@ -8,8 +8,6 @@
 #ifndef __ADSDEF_2_H__
 #define __ADSDEF_2_H__
 
-#include "AdsDef.h"
-
 #ifndef WIN32
 	typedef char BYTE;
 	typedef uint32_t ULONG;

diff --git a/src/LuxServer/src/DataSource/ADS/CMakeLists.txt b/src/LuxServer/src/DataSource/ADS/CMakeLists.txt
@@ -7,17 +7,5 @@ target_link_libraries(adsdatasrc PUBLIC util)
 
 #include the local files
 target_include_directories(adsdatasrc PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
-target_include_directories(adsdatasrc PUBLIC ${CMAKE_SOURCE_DIR}/depends/ADS/AdsLib)
 
-#if windows use the windows library
-if(WIN32)
-    # find_package(ads CONFIG)
-    # target_link_libraries(adsdatasrc PUBLIC ads::ads)
-    target_link_libraries(adsdatasrc PUBLIC debug ${CMAKE_SOURCE_DIR}/lib/debug/ads.lib)
-    target_link_libraries(adsdatasrc PUBLIC optimized ${CMAKE_SOURCE_DIR}/lib/release/ads.lib)
-endif(WIN32)
-
-#if linux use the linux library
-if(UNIX)
-    target_link_libraries(adsdatasrc PUBLIC libAdsLib.a)
-endif(UNIX)
+target_link_libraries(adsdatasrc PUBLIC ads::ads)