From e3e50c19a5869a89c1b96b07cb6cf527e2001f59 Mon Sep 17 00:00:00 2001
From: "jean.chalard" <jean.chalard@01922e74-a4c3-11dd-a5cd-697bfd0a0cef>
Date: Mon, 1 Feb 2010 02:49:26 +0000
Subject: [PATCH] J : * Have JGE compile on Darwin architecture. * I'm not
 saying it works, just that it compiles. * This needs testing on other macs
 than just mine.

---
 JGE/Makefile         | 2 +-
 JGE/include/JTypes.h | 6 ++++--
 JGE/src/JNetwork.cpp | 5 ++++-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/JGE/Makefile b/JGE/Makefile
index 9ac32e02e..28f84a4f3 100644
--- a/JGE/Makefile
+++ b/JGE/Makefile
@@ -81,7 +81,7 @@ ifeq ($(TARGET_ARCHITECTURE),linux)
 OBJS = $(GENERIC_OBJS) $(LINUX_OBJS)
 TARGET_LIB = libjge.a
 TARGET_HGE = libhgetools.a
-INCDIR = $(shell freetype-config --cflags 2> /dev/null)
+INCDIR = $(shell freetype-config --cflags 2> /dev/null) -I/usr/X11/include
 CXXFLAGS += -DLINUX
 CXXFLAGS += $(INCDIR)
 LIBDIR = lib/linux
diff --git a/JGE/include/JTypes.h b/JGE/include/JTypes.h
index fc1605452..09bcf65e4 100644
--- a/JGE/include/JTypes.h
+++ b/JGE/include/JTypes.h
@@ -80,12 +80,14 @@
         typedef unsigned char BYTE;
         typedef bool BOOL;
 #endif
-#if defined (WIN32) || defined (LINUX)
 
+#if defined (WIN32) || defined (LINUX)
 	#include <GL/gl.h>
 	#include <GL/glu.h>
+#endif
 
-	#include "../Dependencies/include/fmod.h"
+#if defined (WIN32) || defined (LINUX) 
+        #include "../Dependencies/include/fmod.h"
 
 
 typedef int8_t s8;
diff --git a/JGE/src/JNetwork.cpp b/JGE/src/JNetwork.cpp
index 9a03ecf06..9ebc82a87 100644
--- a/JGE/src/JNetwork.cpp
+++ b/JGE/src/JNetwork.cpp
@@ -43,9 +43,12 @@ void JNetwork::EndInstance(){
 
 
 
-#if defined (WIN32) || defined (LINUX)
+#if defined (WIN32)
   DWORD JNetwork::netthread = 0;
   int JNetwork::connected_to_ap = 1;
+#elif defined (LINUX)
+  pthread_t JNetwork::netthread = NULL;
+  int JNetwork::connected_to_ap = 1;
 #else
   int JNetwork::connected_to_ap = 0;
   int JNetwork::netthread = 0;