[Gnash-commit] gnash/gui Makefile.am aqua_ogl_glue.cpp aqua.ni...

[Markus Gothe]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Markus Gothe <nihilus>  07/05/15 22:04:18

Modified files:
        gui            : Makefile.am aqua_ogl_glue.cpp 
        gui/aqua.nib   : info.nib objects.xib 

Log message:
        

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/Makefile.am?cvsroot=gnash&r1=1.70&r2=1.71
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/aqua_ogl_glue.cpp?cvsroot=gnash&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/aqua.nib/info.nib?cvsroot=gnash&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/aqua.nib/objects.xib?cvsroot=gnash&r1=1.2&r2=1.3

Patches:
Index: Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/gui/Makefile.am,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -b -r1.70 -r1.71
--- Makefile.am 15 May 2007 21:31:24 -0000      1.70
+++ Makefile.am 15 May 2007 22:04:18 -0000      1.71
@@ -17,7 +17,7 @@
 
 # 
 
-# $Id: Makefile.am,v 1.70 2007/05/15 21:31:24 nihilus Exp $
+# $Id: Makefile.am,v 1.71 2007/05/15 22:04:18 nihilus Exp $
 
 AUTOMAKE_OPTIONS = 
 localedir = $(datadir)/locale
@@ -80,7 +80,7 @@
 endif # USE_GUI_GTK
 if USE_GUI_AQUA
   AQUA_OPENGL_SRCS = aqua_ogl_glue.cpp aqua_ogl_glue.h
-  AM_CPPFLAGS += -framework Carbon -framework openGL -framework AGL
+  AM_LDFLAGS += -framework Carbon -framework openGL -framework AGL
 endif # USE_GUI_AQUA
 if USE_GUI_SDL
   SDL_OPENGL_SRCS = sdl_ogl_glue.cpp sdl_ogl_glue.h

Index: aqua_ogl_glue.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/aqua_ogl_glue.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- aqua_ogl_glue.cpp   9 May 2007 20:28:57 -0000       1.5
+++ aqua_ogl_glue.cpp   15 May 2007 22:04:18 -0000      1.6
@@ -17,12 +17,13 @@
 // 
 //
 
-/* $Id: aqua_ogl_glue.cpp,v 1.5 2007/05/09 20:28:57 nihilus Exp $ */
+/* $Id: aqua_ogl_glue.cpp,v 1.6 2007/05/15 22:04:18 nihilus Exp $ */
 
 
 #include "aqua_ogl_glue.h"
-#include "tu_opengl_includes.h"
-
+#include <AGL/agl.h>
+#include <OpenGL/gl.h>
+#include <OpenGL/glu.h>
 #include "log.h"
 
 #define OVERSIZE 1.0f

Index: aqua.nib/info.nib
===================================================================
RCS file: /sources/gnash/gnash/gui/aqua.nib/info.nib,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- aqua.nib/info.nib   15 May 2007 21:21:17 -0000      1.2
+++ aqua.nib/info.nib   15 May 2007 22:04:18 -0000      1.3
@@ -7,12 +7,12 @@
        <key>IBEditorPositions</key>
        <dict>
                <key>29</key>
-               <string>151 836 223 44 0 0 1680 1028 </string>
+               <string>151 836 142 44 0 0 1680 1028 </string>
        </dict>
        <key>IBFramework Version</key>
        <string>446.1</string>
        <key>IBOldestOS</key>
-       <integer>3</integer>
+       <integer>4</integer>
        <key>IBOpenObjects</key>
        <array>
                <integer>29</integer>

Index: aqua.nib/objects.xib
===================================================================
RCS file: /sources/gnash/gnash/gui/aqua.nib/objects.xib,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- aqua.nib/objects.xib        15 May 2007 21:21:17 -0000      1.2
+++ aqua.nib/objects.xib        15 May 2007 22:04:18 -0000      1.3
@@ -84,7 +84,7 @@
     <reference idRef="190"/>
     <object class="IBCarbonWindow" id="198">
       <string name="windowRect">134 719 494 1199 </string>
-      <string name="title">Window</string>
+      <string name="title">Gnash</string>
       <object name="rootControl" class="IBCarbonRootControl" id="199">
         <string name="bounds">0 0 360 480 </string>
         <string name="viewFrame">0 0 480 360 </string>
@@ -123,12 +123,12 @@
   <dictionary count="4" name="nameTable">
     <string>Files Owner</string>
     <reference idRef="1"/>
+    <string>MainWindow</string>
+    <reference idRef="198"/>
     <string>MenuBar</string>
     <reference idRef="29"/>
     <string>View31</string>
     <reference idRef="204"/>
-    <string>Window</string>
-    <reference idRef="198"/>
   </dictionary>
-  <unsigned_int name="nextObjectID">212</unsigned_int>
+  <unsigned_int name="nextObjectID">214</unsigned_int>
 </object>