2
0
Эх сурвалжийг харах

For downstream - fix macro redefinition warning on VS static build.
[ci only: AppVeyor]

Yao Wei Tjong 姚伟忠 10 жил өмнө
parent
commit
b90c3ba444

+ 3 - 1
CMake/Modules/Urho3D-CMake-common.cmake

@@ -397,7 +397,9 @@ if (URHO3D_LIB_TYPE)
 endif ()
 if (NOT URHO3D_LIB_TYPE STREQUAL SHARED)
     set (URHO3D_LIB_TYPE STATIC)
-    add_definitions (-DURHO3D_STATIC_DEFINE)
+    if (NOT MSVC)   # This define will be baked into the export header for MSVC compiler
+        add_definitions (-DURHO3D_STATIC_DEFINE)
+    endif ()
 endif ()
 
 # Add definition for AngelScript