Nico/Viano-Core
1
0 Fork 0
Code Issues Pull Requests Actions 8 Packages Projects Releases Wiki Activity

Core/Dep: G3D: Correction to patch G3D-v8.0_hotfix5.diff, add missing #ifdef -test (applied to sourcetree as well)

Browse Source
This commit is contained in:
click committed 2013-02-28 13:23:15 +01:00
1 parent e097994b23
commit 523e732c03
2 files changed
+7 -3
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

dep/g3dlite/G3D-v8.0_hotfix5.diff
+4 -2
View File
@@ -2,11 +2,13 @@ diff --git a/dep/g3dlite/include/G3D/System.h b/dep/g3dlite/include/G3D/System.h
index 1c0cf99..f160774 100644 index 1c0cf99..f160774 100644
--- a/dep/g3dlite/include/G3D/System.h --- a/dep/g3dlite/include/G3D/System.h
+++ b/dep/g3dlite/include/G3D/System.h +++ b/dep/g3dlite/include/G3D/System.h
@@ -19,6 +19,7 @@ @@ -19,6 +19,9 @@
#include "G3D/G3DGameUnits.h" #include "G3D/G3DGameUnits.h"
#include "G3D/BinaryFormat.h" #include "G3D/BinaryFormat.h"
#include <string> #include <string>
+#include <sys/socket.h> +#ifdef G3D_LINUX
+# include <sys/socket.h>
+#endif
#ifdef G3D_OSX #ifdef G3D_OSX
# include <CoreServices/CoreServices.h> # include <CoreServices/CoreServices.h>
dep/g3dlite/include/G3D/System.h
+3 -1
View File
@@ -19,7 +19,9 @@
#include "G3D/G3DGameUnits.h" #include "G3D/G3DGameUnits.h"
#include "G3D/BinaryFormat.h" #include "G3D/BinaryFormat.h"
#include <string> #include <string>
#include <sys/socket.h> #ifdef G3D_LINUX
# include <sys/socket.h>
#endif
#ifdef G3D_OSX #ifdef G3D_OSX
# include <CoreServices/CoreServices.h> # include <CoreServices/CoreServices.h>