diff --git a/lldb/include/lldb/API/SBDefines.h b/lldb/include/lldb/API/SBDefines.h --- a/lldb/include/lldb/API/SBDefines.h +++ b/lldb/include/lldb/API/SBDefines.h @@ -15,6 +15,16 @@ #include "lldb/lldb-types.h" #include "lldb/lldb-versioning.h" +#if defined(_WIN32) +#if defined(LLDB_IN_LIBLLDB) +#define LLDB_API __declspec(dllexport) +#else +#define LLDB_API __declspec(dllimport) +#endif +#else // defined (_WIN32) +#define LLDB_API +#endif + // Forward Declarations namespace lldb { diff --git a/lldb/include/lldb/lldb-defines.h b/lldb/include/lldb/lldb-defines.h --- a/lldb/include/lldb/lldb-defines.h +++ b/lldb/include/lldb/lldb-defines.h @@ -11,18 +11,6 @@ #include "lldb/lldb-types.h" -#if defined(_WIN32) -#if defined(EXPORT_LIBLLDB) -#define LLDB_API __declspec(dllexport) -#elif defined(IMPORT_LIBLLDB) -#define LLDB_API __declspec(dllimport) -#else -#define LLDB_API -#endif -#else // defined (_WIN32) -#define LLDB_API -#endif - #if !defined(INT32_MAX) #define INT32_MAX 2147483647 #endif diff --git a/lldb/source/API/CMakeLists.txt b/lldb/source/API/CMakeLists.txt --- a/lldb/source/API/CMakeLists.txt +++ b/lldb/source/API/CMakeLists.txt @@ -1,7 +1,3 @@ -if ( CMAKE_SYSTEM_NAME MATCHES "Windows" ) - add_definitions( -DEXPORT_LIBLLDB ) -endif() - get_property(LLDB_ALL_PLUGINS GLOBAL PROPERTY LLDB_PLUGINS) if(LLDB_BUILD_FRAMEWORK) @@ -165,6 +161,7 @@ VERSION ${LLDB_VERSION} ) +target_compile_definitions(liblldb PRIVATE LLDB_IN_LIBLLDB) if (NOT CMAKE_SYSTEM_NAME MATCHES "Windows") if (NOT LLDB_EXPORT_ALL_SYMBOLS) # If we're not exporting all symbols, we'll want to explicitly set diff --git a/lldb/tools/driver/CMakeLists.txt b/lldb/tools/driver/CMakeLists.txt --- a/lldb/tools/driver/CMakeLists.txt +++ b/lldb/tools/driver/CMakeLists.txt @@ -23,10 +23,6 @@ Support ) -if ( CMAKE_SYSTEM_NAME MATCHES "Windows" ) - add_definitions( -DIMPORT_LIBLLDB ) -endif() - add_dependencies(lldb LLDBOptionsTableGen ${tablegen_deps} diff --git a/lldb/tools/lldb-vscode/CMakeLists.txt b/lldb/tools/lldb-vscode/CMakeLists.txt --- a/lldb/tools/lldb-vscode/CMakeLists.txt +++ b/lldb/tools/lldb-vscode/CMakeLists.txt @@ -1,5 +1,4 @@ if ( CMAKE_SYSTEM_NAME MATCHES "Windows" OR CMAKE_SYSTEM_NAME MATCHES "NetBSD" ) - add_definitions( -DIMPORT_LIBLLDB ) list(APPEND extra_libs lldbHost) endif ()