Merge branch 'master' of https://github.com/okamstudio/godot

2015-01-18 09:52:10 -03:00 · 2015-01-18 09:52:10 -03:00 · e0c0aef615
parent 6f3c09047e 2b22aba39e
commit e0c0aef615
1 changed files with 4 additions and 0 deletions
--- a/platform/windows/os_windows.cpp
+++ b/platform/windows/os_windows.cpp
@ -57,7 +57,11 @@
 static const WORD MAX_CONSOLE_LINES = 1500;

 extern "C" {
+#ifdef _MSC_VER
 	_declspec(dllexport) DWORD NvOptimusEnablement = 0x00000001;
+#else
+	__attribute__((visibility("default"))) DWORD NvOptimusEnablement = 0x00000001;
+#endif
 }

 //#define STDOUT_FILE