Mercurial > sdl-ios-xcode

changeset 3438:ca5663493497

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Scott to slouken Heres the wiz patch and additional files. (I think I got everything)
author Sam Lantinga <slouken@libsdl.org>
date Tue, 17 Nov 2009 04:53:15 +0000
parents dc2911c207e4
children 0acec8c9f5c9
files Makefile.wiz include/SDL_config_wiz.h src/video/pandora/SDL_pandora.c
diffstat 3 files changed, 236 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Makefile.wiz	Tue Nov 17 04:53:15 2009 +0000
@@ -0,0 +1,61 @@
+# Makefile to build the pandora SDL library
+WIZSDK = /mythtv/media/devel/toolchains/openwiz/arm-openwiz-linux-gnu
+
+AR	= $(WIZSDK)/bin/arm-openwiz-linux-gnu-ar
+RANLIB	= $(WIZSDK)/bin/arm-openwiz-linux-gnu-ranlib
+CC = $(WIZSDK)/bin/arm-openwiz-linux-gnu-gcc
+CXX = $(WIZSDK)/bin/arm-openwiz-linux-gnu-g++
+STRIP = $(WIZSDK)/bin/arm-openwiz-linux-gnu-strip
+
+CFLAGS  = -Wall -fPIC -I./include -I$(WIZSDK)/include -DWIZ_GLES_LITE
+
+TARGET_STATIC  = libSDL13.a
+TARGET_SHARED  = libSDL13.so
+
+SOURCES = ./src/*.c ./src/audio/*.c ./src/cdrom/*.c ./src/cpuinfo/*.c ./src/events/*.c \
+	./src/file/*.c ./src/stdlib/*.c ./src/thread/*.c ./src/timer/*.c ./src/video/*.c \
+	./src/joystick/*.c ./src/haptic/*.c ./src/video/dummy/*.c ./src/audio/disk/*.c \
+	./src/audio/dummy/*.c ./src/loadso/dlopen/*.c ./src/audio/dsp/*.c ./src/audio/dma/*.c \
+	./src/thread/pthread/SDL_systhread.c ./src/thread/pthread/SDL_syssem.c \
+	./src/thread/pthread/SDL_sysmutex.c ./src/thread/pthread/SDL_syscond.c \
+	./src/joystick/linux/*.c ./src/haptic/linux/*.c ./src/timer/unix/*.c ./src/cdrom/dummy/*.c \
+	./src/video/pandora/SDL_pandora.o ./src/video/pandora/SDL_pandora_events.o
+	
+
+OBJECTS = $(shell echo $(SOURCES) | sed -e 's,\.c,\.o,g')
+
+all: config_copy $(TARGET_STATIC) $(TARGET_SHARED)
+
+$(TARGET_STATIC): $(OBJECTS)
+	$(AR) crv $@ $^
+	$(RANLIB) $@
+
+$(TARGET_SHARED):
+	$(CC) -shared -Wl,-soname,$(TARGET_SHARED).0 -o $(TARGET_SHARED).0.0.1  $(OBJECTS)
+	ln -s $(TARGET_SHARED).0.0.1 $(TARGET_SHARED).0
+	ln -s $(TARGET_SHARED).0 $(TARGET_SHARED)
+
+config_copy:
+	cp include/SDL_config_wiz.h include/SDL_config.h
+
+clean:
+	rm -f $(TARGET_STATIC) $(TARGET_SHARED)* $(OBJECTS)
+
+install:
+	mkdir -p $(WIZSDK)/lib
+	mkdir -p $(WIZSDK)/include/SDL13
+	cp -f $(TARGET_STATIC) $(WIZSDK)/lib
+	cp -f $(TARGET_SHARED).0.0.1 $(WIZSDK)/lib
+	rm -f $(WIZSDK)/lib/$(TARGET_SHARED).0 $(WIZSDK)/lib/$(TARGET_SHARED)
+	ln -s $(WIZSDK)/lib/$(TARGET_SHARED).0.0.1 $(WIZSDK)/lib/$(TARGET_SHARED).0
+	ln -s $(WIZSDK)/lib/$(TARGET_SHARED).0 $(WIZSDK)/lib/$(TARGET_SHARED)
+
+	cp $(TARGET_STATIC) ../../toolchain/libs
+	cp $(TARGET_SHARED).0.0.1 ../../toolchain/libs
+	rm -f ../../toolchain/libs/$(TARGET_SHARED).0 ../../toolchain/libs/$(TARGET_SHARED)
+	ln -s ../../toolchain/libs/$(TARGET_SHARED).0.0.1 ../../toolchain/libs/$(TARGET_SHARED).0
+	ln -s ../../toolchain/libs/$(TARGET_SHARED).0 ../../toolchain/libs/$(TARGET_SHARED)
+
+	cp $(TARGET_SHARED).0.0.1 ../nehe_demos/build/$(TARGET_SHARED).0
+	cp -f include/*.h $(WIZSDK)/include/SDL13/
+	cp -f include/*.h ../../toolchain/include/SDL13/
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/include/SDL_config_wiz.h	Tue Nov 17 04:53:15 2009 +0000
@@ -0,0 +1,125 @@
+/*
+    SDL - Simple DirectMedia Layer
+    Copyright (C) 1997-2009 Sam Lantinga
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+    Sam Lantinga
+    slouken@libsdl.org
+*/
+
+#ifndef _SDL_config_h
+#define _SDL_config_h
+
+/* This is a set of defines to configure the SDL features */
+
+/* General platform specific identifiers */
+#include "SDL_platform.h"
+
+/* Make sure that this isn't included by Visual C++ */
+#ifdef _MSC_VER
+#error You should copy include/SDL_config.h.default to include/SDL_config.h
+#endif
+
+#define SDL_HAS_64BIT_TYPE 1
+#define SDL_BYTEORDER 1234
+
+#define HAVE_ALLOCA_H 1
+#define HAVE_SYS_TYPES_H 1
+#define HAVE_STDIO_H 1
+#define STDC_HEADERS 1
+#define HAVE_STDLIB_H 1
+#define HAVE_STDARG_H 1
+#define HAVE_MALLOC_H 1
+#define HAVE_MEMORY_H 1
+#define HAVE_STRING_H 1
+#define HAVE_STRINGS_H 1
+#define HAVE_INTTYPES_H 1
+#define HAVE_STDINT_H 1
+#define HAVE_CTYPE_H 1
+#define HAVE_MATH_H 1
+#define HAVE_ICONV_H 1
+#define HAVE_SIGNAL_H 1
+#define HAVE_MALLOC 1
+#define HAVE_CALLOC 1
+#define HAVE_REALLOC 1
+#define HAVE_FREE 1
+#define HAVE_ALLOCA 1
+#define HAVE_GETENV 1
+#define HAVE_PUTENV 1
+#define HAVE_UNSETENV 1
+#define HAVE_QSORT 1
+#define HAVE_ABS 1
+#define HAVE_BCOPY 1
+#define HAVE_MEMSET 1
+#define HAVE_MEMCPY 1
+#define HAVE_MEMMOVE 1
+#define HAVE_STRLEN 1
+#define HAVE_STRDUP 1
+#define HAVE_STRCHR 1
+#define HAVE_STRRCHR 1
+#define HAVE_STRSTR 1
+#define HAVE_STRTOL 1
+#define HAVE_STRTOUL 1
+#define HAVE_STRTOLL 1
+#define HAVE_STRTOULL 1
+#define HAVE_ATOI 1
+#define HAVE_ATOF 1
+#define HAVE_STRCMP 1
+#define HAVE_STRNCMP 1
+#define HAVE_STRCASECMP 1
+#define HAVE_STRNCASECMP 1
+#define HAVE_SSCANF 1
+#define HAVE_SNPRINTF 1
+#define HAVE_VSNPRINTF 1
+#define HAVE_M_PI 1
+#define HAVE_CEIL 1
+#define HAVE_COPYSIGN 1
+#define HAVE_COS 1
+#define HAVE_COSF 1
+#define HAVE_FABS 1
+#define HAVE_FLOOR 1
+#define HAVE_LOG 1
+#define HAVE_SCALBN 1
+#define HAVE_SIN 1
+#define HAVE_SINF 1
+#define HAVE_SQRT 1
+#define HAVE_SIGACTION 1
+#define HAVE_SETJMP 1
+#define HAVE_NANOSLEEP 1
+#define HAVE_POW 1
+
+#define SDL_CDROM_DISABLED 1
+#define SDL_AUDIO_DRIVER_DUMMY 1
+#define SDL_AUDIO_DRIVER_OSS 1
+
+#define SDL_INPUT_LINUXEV 1
+#define SDL_INPUT_TSLIB 1
+#define SDL_JOYSTICK_LINUX 1
+#define SDL_HAPTIC_LINUX 1
+
+#define SDL_LOADSO_DLOPEN 1
+
+#define SDL_THREAD_PTHREAD 1
+#define SDL_THREAD_PTHREAD_RECURSIVE_MUTEX_NP 1
+
+#define SDL_TIMER_UNIX 1
+
+#define SDL_VIDEO_DRIVER_DUMMY 1
+#define SDL_VIDEO_DRIVER_PANDORA 1
+#define SDL_VIDEO_RENDER_OGL_ES 1
+#define SDL_VIDEO_OPENGL_ES 1
+
+#endif /* _SDL_config_h */
--- a/src/video/pandora/SDL_pandora.c	Mon Nov 16 09:47:34 2009 +0000
+++ b/src/video/pandora/SDL_pandora.c	Tue Nov 17 04:53:15 2009 +0000
@@ -38,6 +38,12 @@
 #include "SDL_pandora.h"
 #include "SDL_pandora_events.h"
 
+/* WIZ declarations */
+#include "GLES/gl.h"
+#ifdef WIZ_GLES_LITE
+static NativeWindowType hNativeWnd = 0; // A handle to the window we will create.
+#endif
+
 static SDL_bool PND_initialized = SDL_FALSE;
 
 static int
@@ -136,8 +142,13 @@
 }
 
 VideoBootStrap PND_bootstrap = {
+#ifdef WIZ_GLES_LITE
+    "wiz",
+    "SDL Wiz Video Driver",
+#else
     "pandora",
     "SDL Pandora Video Driver",
+#endif
     PND_available,
     PND_create
 };
@@ -152,8 +163,13 @@
     SDL_DisplayMode current_mode;
 
     SDL_zero(current_mode);
+#ifdef WIZ_GLES_LITE
+    current_mode.w = 320;
+    current_mode.h = 240;
+#else
     current_mode.w = 800;
     current_mode.h = 480;
+#endif
     current_mode.refresh_rate = 60;
     current_mode.format = SDL_PIXELFORMAT_RGB565;
     current_mode.driverdata = NULL;
@@ -371,7 +387,11 @@
     if (path == NULL) {
         /* Already linked with GF library which provides egl* subset of  */
         /* functions, use Common profile of OpenGL ES library by default */
+#ifdef WIZ_GLES_LITE
+	path = "/lib/libopengles_lite.so";
+#else
         path = "/usr/lib/libGLES_CM.so";
+#endif
     }
 
     /* Load dynamic library */
@@ -652,10 +672,31 @@
         return NULL;
     }
 
+#ifdef WIZ_GLES_LITE
+    if( !hNativeWnd ) {
+	hNativeWnd = (NativeWindowType)malloc(16*1024);
+
+	if(!hNativeWnd)
+	    printf( "Error : Wiz framebuffer allocatation failed\n" ); 
+	else
+	    printf( "SDL13: Wiz framebuffer allocated: %X\n", hNativeWnd );
+    }
+    else {
+	printf( "SDL13: Wiz framebuffer already allocated: %X\n", hNativeWnd );
+    }
+
+    wdata->gles_surface =
+	eglCreateWindowSurface(phdata->egl_display, 
+			       wdata->gles_configs[wdata->gles_config],
+			       hNativeWnd, NULL );
+#else
     wdata->gles_surface =
         eglCreateWindowSurface(phdata->egl_display,
                                wdata->gles_configs[wdata->gles_config],
                                (NativeWindowType) 0, NULL);
+#endif
+
+
     if (wdata->gles_surface == 0) {
         SDL_SetError("Error : eglCreateWindowSurface failed;\n");
         return NULL;
@@ -856,6 +897,15 @@
         }
     }
 
+#ifdef WIZ_GLES_LITE
+    if( hNativeWnd != 0 )
+    {
+	  free(hNativeWnd);
+	  hNativeWnd = 0;
+	  printf( "SDL13: Wiz framebuffer released\n" );
+    }
+#endif
+
     return;
 }