Browse Source

Add ODBC compile fix for Windows from lvshiling. Closes #1256.

Lasse Öörni 9 years ago
parent
commit
aa1199ebf1
3 changed files with 8 additions and 0 deletions
  1. 1 0
      Docs/Urho3D.dox
  2. 1 0
      README.md
  3. 6 0
      Source/Urho3D/Database/ODBC/ODBCConnection.cpp

+ 1 - 0
Docs/Urho3D.dox

@@ -121,6 +121,7 @@ Urho3D development, contributions and bugfixes by:
 - dragonCASTjosh
 - feltech
 - hdunderscore
+- lvshiling
 - marynate
 - mightyCelu
 - nemerle

+ 1 - 0
README.md

@@ -73,6 +73,7 @@ Urho3D development, contributions and bugfixes by:
 - dragonCASTjosh
 - feltech
 - hdunderscore
+- lvshiling
 - marynate
 - mightyCelu
 - nemerle

+ 6 - 0
Source/Urho3D/Database/ODBC/ODBCConnection.cpp

@@ -25,6 +25,12 @@
 #include "../../Database/DatabaseEvents.h"
 #include "../../IO/Log.h"
 
+#ifdef _WIN32
+// Needs to be included above sql.h for windows
+#define NOMINMAX
+#include <windows.h>
+#endif
+
 #include <sqlext.h>
 
 namespace Urho3D