We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

[patch] DLL_EXPORT patch

5384_0.patch (text/plain), 3.62 KB, created by Ozkan Sezer on 2020-12-09 00:40:50 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ozkan Sezer

Created: 2020-12-09 00:40:50 UTC

Size: 3.62 KB

patch

obsolete

>diff --git a/CMakeLists.txt b/CMakeLists.txt
>--- a/CMakeLists.txt
>+++ b/CMakeLists.txt
>@@ -2212,6 +2212,10 @@
>       SOVERSION ${LT_REVISION}
>       OUTPUT_NAME "SDL2-${LT_RELEASE}")
>   else()
>+    if(WINDOWS OR CYGWIN)
>+      set_target_properties(SDL2 PROPERTIES
>+        DEFINE_SYMBOL DLL_EXPORT)
>+    endif()
>     set_target_properties(SDL2 PROPERTIES
>       VERSION ${SDL_VERSION}
>       SOVERSION ${LT_REVISION}
>diff --git a/VisualC/SDL/SDL.vcxproj b/VisualC/SDL/SDL.vcxproj
>--- a/VisualC/SDL/SDL.vcxproj
>+++ b/VisualC/SDL/SDL.vcxproj
>@@ -96,7 +96,7 @@
>       <Optimization>Disabled</Optimization>
>       <AdditionalIncludeDirectories>$(ProjectDir)/../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
>       <AdditionalUsingDirectories>%(AdditionalUsingDirectories)</AdditionalUsingDirectories>
>-      <PreprocessorDefinitions>_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
>+      <PreprocessorDefinitions>DLL_EXPORT;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
>       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
>       <BufferSecurityCheck>false</BufferSecurityCheck>
>       <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>
>@@ -127,7 +127,7 @@
>       <Optimization>Disabled</Optimization>
>       <AdditionalIncludeDirectories>$(ProjectDir)/../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
>       <AdditionalUsingDirectories>%(AdditionalUsingDirectories)</AdditionalUsingDirectories>
>-      <PreprocessorDefinitions>_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
>+      <PreprocessorDefinitions>DLL_EXPORT;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
>       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
>       <BufferSecurityCheck>false</BufferSecurityCheck>
>       <WarningLevel>Level3</WarningLevel>
>@@ -160,7 +160,7 @@
>     <ClCompile>
>       <AdditionalIncludeDirectories>$(ProjectDir)/../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
>       <AdditionalUsingDirectories>%(AdditionalUsingDirectories)</AdditionalUsingDirectories>
>-      <PreprocessorDefinitions>NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
>+      <PreprocessorDefinitions>DLL_EXPORT;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
>       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
>       <BufferSecurityCheck>false</BufferSecurityCheck>
>       <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>
>@@ -192,7 +192,7 @@
>     <ClCompile>
>       <AdditionalIncludeDirectories>$(ProjectDir)/../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
>       <AdditionalUsingDirectories>%(AdditionalUsingDirectories)</AdditionalUsingDirectories>
>-      <PreprocessorDefinitions>NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
>+      <PreprocessorDefinitions>DLL_EXPORT;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
>       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
>       <BufferSecurityCheck>false</BufferSecurityCheck>
>       <WarningLevel>Level3</WarningLevel>
>diff --git a/include/begin_code.h b/include/begin_code.h
>--- a/include/begin_code.h
>+++ b/include/begin_code.h
>@@ -52,13 +52,7 @@
> /* Some compilers use a special export keyword */
> #ifndef DECLSPEC
> # if defined(__WIN32__) || defined(__WINRT__)
>-#  ifdef __BORLANDC__
>-#   ifdef BUILD_SDL
>-#    define DECLSPEC
>-#   else
>-#    define DECLSPEC    __declspec(dllimport)
>-#   endif
>-#  elif defined(_DLL)
>+#  if defined (DLL_EXPORT)
> #   define DECLSPEC __declspec(dllexport)
> #  else
> #   define DECLSPEC

Actions: View | Diff

Attachments on bug 5384: 4556

We are currently migrating Bugzilla to GitHub issues.Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.