[Vm-dev] [commit][3484] Fix OpenGL compilation on case-sensitive
Mac filesystems.
commits at squeakvm.org
commits at squeakvm.org
Thu Nov 5 18:16:40 UTC 2015
Revision: 3484
Author: eliot
Date: 2015-11-05 10:16:38 -0800 (Thu, 05 Nov 2015)
Log Message:
-----------
Fix OpenGL compilation on case-sensitive Mac filesystems.
Ignore the bochs build artifacts
Modified Paths:
--------------
branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXOpenGLView.m
Property Changed:
----------------
branches/Cog/build.macos32x86/bochsx64/
branches/Cog/build.macos32x86/bochsx86/
branches/Cog/platforms/Cross/vm/sqSCCSVersion.h
Property changes on: branches/Cog/build.macos32x86/bochsx64
___________________________________________________________________
Added: svn:ignore
+ *
Property changes on: branches/Cog/build.macos32x86/bochsx86
___________________________________________________________________
Added: svn:ignore
+ *
Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h
___________________________________________________________________
Modified: checkindate
- Thu Sep 24 12:15:28 PDT 2015
+ Thu Nov 5 10:15:54 PST 2015
Modified: branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXOpenGLView.m
===================================================================
--- branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXOpenGLView.m 2015-11-02 22:31:32 UTC (rev 3483)
+++ branches/Cog/platforms/iOS/vm/OSX/sqSqueakOSXOpenGLView.m 2015-11-05 18:16:38 UTC (rev 3484)
@@ -48,8 +48,12 @@
#import "sqVirtualMachine.h"
//#import <OpenGL/CGLMacro.h>
-#import <OpenGL/gl.h>
-#import <OpenGL/Opengl.h>
+# import <OpenGL/gl.h>
+#if __MAC_OS_X_VERSION_MAX_ALLOWED >= 1070
+# import <OpenGL/OpenGL.h>
+#else
+# import <OpenGL/Opengl.h>
+#endif
extern SqueakOSXAppDelegate *gDelegateApp;
extern struct VirtualMachine* interpreterProxy;
More information about the Vm-dev
mailing list