From ecd3f5fe01b85689ad4924075d0ce41abe1036c8 Mon Sep 17 00:00:00 2001
From: Nikos Barkas <another_cmdr@oolite.org>
Date: Wed, 23 May 2007 10:31:16 +0000
Subject: [PATCH] Eliminate a few more compile errors on Windows. Add a more
 recent JavaScript API. Add import library for libpng.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@981 127b21dd-08f5-0310-b4b7-95ae10353056
---
 src/Core/Entities/ParticleEntity.m  | 4 ++--
 src/Core/OOCocoa.h                  | 3 +++
 src/Core/Scripting/OOJSQuaternion.m | 6 ++++++
 src/Core/Scripting/OOJSVector.m     | 6 ++++++
 4 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/src/Core/Entities/ParticleEntity.m b/src/Core/Entities/ParticleEntity.m
index 0aef9f6b..c7bd8b88 100644
--- a/src/Core/Entities/ParticleEntity.m
+++ b/src/Core/Entities/ParticleEntity.m
@@ -2046,8 +2046,8 @@ static void DrawQuadForView(GLfloat x, GLfloat y, GLfloat z, GLfloat xx, GLfloat
 
 	// Force the sky textures to be reloaded next time a frame is drawn.
 	texName = 0;
-	faces[0].texName = 0;
-	faces[1].texName = 0;
+	faces[0].textureName = 0;
+	faces[1].textureName = 0;
 
 	// Reset the entity display list.
 	[super reloadTextures];
diff --git a/src/Core/OOCocoa.h b/src/Core/OOCocoa.h
index 98707348..e2f9edf3 100644
--- a/src/Core/OOCocoa.h
+++ b/src/Core/OOCocoa.h
@@ -80,7 +80,10 @@ MA 02110-1301, USA.
 typedef int32_t CGMouseDelta;
 
 #import "Comparison.h"
+
+#if ! OOLITE_GNUSTEP
 #import "OOColor.h"
+#endif
 
 typedef char Str255[256];
 
diff --git a/src/Core/Scripting/OOJSQuaternion.m b/src/Core/Scripting/OOJSQuaternion.m
index 9460a500..ca96dd89 100644
--- a/src/Core/Scripting/OOJSQuaternion.m
+++ b/src/Core/Scripting/OOJSQuaternion.m
@@ -25,7 +25,13 @@ MA 02110-1301, USA.
 
 #import "OOJSQuaternion.h"
 #import "OOJavaScriptEngine.h"
+
+#if OOLITE_GNUSTEP
+#import <GNUstepBase/GSObjCRuntime.h>
+#else
 #import <objc/objc-runtime.h>
+#endif
+
 #import "OOConstToString.h"
 #import "OOJSEntity.h"
 #import "OOJSVector.h"
diff --git a/src/Core/Scripting/OOJSVector.m b/src/Core/Scripting/OOJSVector.m
index 05bd63d8..90da450d 100644
--- a/src/Core/Scripting/OOJSVector.m
+++ b/src/Core/Scripting/OOJSVector.m
@@ -25,7 +25,13 @@ MA 02110-1301, USA.
 
 #import "OOJSVector.h"
 #import "OOJavaScriptEngine.h"
+
+#if OOLITE_GNUSTEP
+#import <GNUstepBase/GSObjCRuntime.h>
+#else
 #import <objc/objc-runtime.h>
+#endif
+
 #import "OOConstToString.h"
 #import "OOJSEntity.h"
 #import "OOJSQuaternion.h"