瀏覽代碼

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

Lasse Öörni 9 年之前
父節點
當前提交
aa1199ebf1
共有 3 個文件被更改,包括 8 次插入0 次删除
  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
 - dragonCASTjosh
 - feltech
 - feltech
 - hdunderscore
 - hdunderscore
+- lvshiling
 - marynate
 - marynate
 - mightyCelu
 - mightyCelu
 - nemerle
 - nemerle

+ 1 - 0
README.md

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

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

@@ -25,6 +25,12 @@
 #include "../../Database/DatabaseEvents.h"
 #include "../../Database/DatabaseEvents.h"
 #include "../../IO/Log.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>
 #include <sqlext.h>
 
 
 namespace Urho3D
 namespace Urho3D