EGL: more code reusability

git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1178 7f0cb862-5218-0410-a997-914c9d46530a

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a23bd02..397caff 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -103,12 +103,14 @@ ELSEIF(ANDROID)
         src/egl/fg_display_egl.c
         src/egl/fg_init_egl.c
         src/egl/fg_structure_egl.c
+        src/egl/fg_structure_egl.h
         src/egl/fg_window_egl.c
         src/egl/fg_window_egl.h
         src/android/native_app_glue/android_native_app_glue.c
         src/android/native_app_glue/android_native_app_glue.h
         src/android/fg_runtime_android.c
         src/android/fg_gamemode_android.c
+        src/android/fg_structure_android.c
         src/android/fg_init_android.c
         src/android/fg_input_devices_android.c
         src/android/fg_joystick_android.c

diff --git a/src/android/fg_structure_android.c b/src/android/fg_structure_android.c
new file mode 100644 (file)
index 0000000..b7acd20
--- /dev/null
+++ b/src/android/fg_structure_android.c
@@ -0,0 +1,36 @@
+/*
+ * fg_structure_android.c
+ *
+ * Windows and menus need tree structure
+ *
+ * Copyright (C) 2012  Sylvain Beucler
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * PAWEL W. OLSZTA BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include <GL/freeglut.h>
+#include "fg_internal.h"
+#include "egl/fg_structure_egl.h"
+
+/**
+ * Initialize default platform-specific fields in SFG_Window
+ */
+void fgPlatformCreateWindow ( SFG_Window *window )
+{
+  fghPlatformCreateWindowEGL(window);
+}

diff --git a/src/egl/fg_structure_egl.c b/src/egl/fg_structure_egl.c
index 55893d8..135f049 100644 (file)
--- a/src/egl/fg_structure_egl.c
+++ b/src/egl/fg_structure_egl.c
@@ -1,5 +1,5 @@
 /*
- * freeglut_structure_egl.c
+ * fg_structure_egl.c
  *
  * Windows and menus need tree structure
  *
@@ -26,12 +26,10 @@
 #include <GL/freeglut.h>
 #include "fg_internal.h"
 
-extern SFG_Structure fgStructure;
-
 /**
  * Initialize default platform-specific fields in SFG_Window
  */
-void fgPlatformCreateWindow ( SFG_Window *window )
+void fghPlatformCreateWindowEGL ( SFG_Window *window )
 {
   window->Window.pContext.egl.Surface = EGL_NO_SURFACE;
   window->Window.pContext.egl.Config = NULL;

diff --git a/src/egl/fg_structure_egl.h b/src/egl/fg_structure_egl.h
new file mode 100644 (file)
index 0000000..45703be
--- /dev/null
+++ b/src/egl/fg_structure_egl.h
@@ -0,0 +1,31 @@
+/*
+ * fg_structure_egl.h
+ *
+ * Windows and menus need tree structure
+ *
+ * Copyright (C) 2012  Sylvain Beucler
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * PAWEL W. OLSZTA BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#ifndef __FG_STRUCTURE_EGL_H__
+#define __FG_STRUCTURE_EGL_H__
+
+extern void fghPlatformCreateWindowEGL ( SFG_Window *window );
+
+#endif