Bläddra i källkod

Fix clang-tools build.
[skip appveyor] [ci only: Annotate]

Yao Wei Tjong 姚伟忠 10 år sedan
förälder
incheckning
bf50a58a0a

+ 1 - 2
CMake/Modules/FindUrho3D.cmake

@@ -36,7 +36,6 @@
 #  URHO3D_LIB_TYPE (may be used as input variable as well to limit the search of library type)
 #  URHO3D_OPENGL
 #  URHO3D_SSE
-#  URHO3D_DATABASE
 #  URHO3D_DATABASE_ODBC
 #  URHO3D_DATABASE_SQLITE
 #
@@ -164,7 +163,7 @@ else ()
     if (NOT URHO3D_LIB_TYPE)
         set (URHO3D_LIB_TYPE_WAS_UNDEFINED TRUE)    # We need this to undefine the auto-discovered URHO3D_LIB_TYPE variable before looping
     endif ()
-    set (AUTO_DISCOVER_VARS URHO3D_OPENGL URHO3D_D3D11 URHO3D_SSE URHO3D_DATABASE URHO3D_DATABASE_ODBC URHO3D_DATABASE_SQLITE)
+    set (AUTO_DISCOVER_VARS URHO3D_OPENGL URHO3D_D3D11 URHO3D_SSE URHO3D_DATABASE_ODBC URHO3D_DATABASE_SQLITE)
     foreach (ABI_64BIT RANGE ${URHO3D_64BIT} 0)
         # Break if the compiler is not multilib-capable and the ABI is not its native
         if ((MSVC OR MINGW OR ANDROID OR RPI OR EMSCRIPTEN) AND NOT ABI_64BIT EQUAL URHO3D_DEFAULT_64BIT)

+ 2 - 2
CMake/Modules/Urho3D-CMake-common.cmake

@@ -476,10 +476,10 @@ if (URHO3D_DATABASE_ODBC)
     set (URHO3D_DATABASE_SQLITE 0)
     find_package (ODBC REQUIRED)
     set (URHO3D_C++11 1)
-    set (URHO3D_DATABASE 1)
 endif ()
-if (URHO3D_DATABASE_SQLITE)
+if (URHO3D_DATABASE_SQLITE OR URHO3D_DATABASE_ODBC)
     set (URHO3D_DATABASE 1)
+    add_definitions (-DURHO3D_DATABASE)
 endif ()
 
 # Find Direct3D include & library directories in MS Windows SDK or DirectX SDK. They may also be required by SDL

+ 0 - 1
CMake/Modules/exportheader.cmake.in

@@ -27,7 +27,6 @@
 #cmakedefine URHO3D_OPENGL
 #cmakedefine URHO3D_D3D11
 #cmakedefine URHO3D_SSE
-#cmakedefine URHO3D_DATABASE
 #cmakedefine URHO3D_DATABASE_ODBC
 #cmakedefine URHO3D_DATABASE_SQLITE
 

+ 0 - 3
Source/Urho3D/LibraryInfo.cpp

@@ -44,9 +44,6 @@ const char* GetCompilerDefines()
 #ifdef URHO3D_SSE
     "#define URHO3D_SSE\n"
 #endif
-#ifdef URHO3D_DATABASE
-    "#define URHO3D_DATABASE\n"
-#endif
 #ifdef URHO3D_DATABASE_ODBC
     "#define URHO3D_DATABASE_ODBC\n"
 #elif defined(URHO3D_DATABASE_SQLITE)