gles: tweak Makefile, credits

3 files changed, 44 insertions, 39 deletions

diff --git a/Makefile b/Makefile
index 724fdbc..673e768 100644
--- a/Makefile
+++ b/Makefile
@@ -88,6 +88,9 @@ $(TARGET): $(OBJS)
 spunull.so: plugins/spunull/spunull.c
 	$(CC) $(CFLAGS) -shared -fPIC -ggdb -O2 -o $@ $^
 
+plugins/gpu-gles/gpuGLES.so:
+	make -C plugins/gpu-gles/
+
 clean:
 	$(RM) $(TARGET) $(OBJS)
 
@@ -97,7 +100,8 @@ PND_MAKE ?= $(HOME)/dev/pnd/src/pandora-libraries/testdata/scripts/pnd_make.sh
 
 VER ?= $(shell git describe --abbrev=0 master)
 
-rel: pcsx spunull.so pandora/pcsx.sh pandora/pcsx.pxml pandora/pcsx.png \
+rel: pcsx spunull.so plugins/gpu-gles/gpuGLES.so \
+		pandora/pcsx.sh pandora/pcsx.pxml pandora/pcsx.png \
 		pandora/picorestore pandora/readme.txt skin COPYING
 	rm -rf out
 	mkdir -p out/plugins
diff --git a/pandora/readme.txt b/pandora/readme.txt
index 51ca33d..9a87e26 100644
--- a/pandora/readme.txt
+++ b/pandora/readme.txt
@@ -22,10 +22,10 @@ This version features a framebuffer driven menu that can be used to run
 games and configure the emulator.
 
 Supportd CD image formats:
-- .cue/.bin
-- .toc/.bin
-- .img
-- .mds
+- .bin/.cue
+- .bin/.toc
+- .img/.ccd/.sub
+- .mdf/.mds
 - .Z/.Z.table
 
 CDDA (CD audio) support requires .cue/.bin format.
@@ -55,6 +55,8 @@ r1:
 Credits / License
 -----------------
 
+Emulator core:
+
 (C) 1999-2003 PCSX Team
 	(c) 1998 Vision Thing
 	Linuzappz     <linuzappz@pcsx.net>
@@ -85,10 +87,21 @@ Credits / License
 	Tristin Celestin (PulseAudio support)
 	Wei Mingzhi (Maintainer, input plugin, iso/cheat support, misc stuff)
 
-GPU and SPU code by Pete Bernert and the P.E.Op.S. team
-ARM recompiler (C) 2009-2010 Ari64
+GLES plugin:
+	(C) 1999-2009 by Pete Bernert
+	EQ
+	Olli Hinkka
+	Proger
+	Pickle
+
+builtin GPU/SPU plugins:
+	Pete Bernert and the P.E.Op.S. team
+
+MIPS->ARM recompiler:
+	(C) 2009-2010 Ari64
 
-integration, optimization and frontend (C) 2010 notaz
+integration, optimization and frontend:
+	(C) 2010-2011 notaz
 
 Source code is released under GNU GPL license, version 2 or later.
 See COPYING included in the archive (.pnd can be extracted using unsquashfs).
diff --git a/plugins/gpu-gles/Makefile b/plugins/gpu-gles/Makefile
index 48f84b8..fdefb08 100644
--- a/plugins/gpu-gles/Makefile
+++ b/plugins/gpu-gles/Makefile
@@ -2,42 +2,30 @@
 # MAKEFILE FOR PETE'S MESAGL GPU... just run "make"

 ##############################################################################

 

-##############################################################################

-# 1. SETS (CCFLAGS3 is used)

-##############################################################################

-

-PREFIX	= /mythtv/media/devel/toolchains/pandora/arm-2007q3

-TARGET	= arm-none-linux-gnueabi-

-

-CC = $(PREFIX)/bin/$(TARGET)gcc

+#PREFIX	= /mythtv/media/devel/toolchains/pandora/arm-2007q3/

+CROSS_COMPILE ?= arm-none-linux-gnueabi-

 

-CCFLAGS = -fPIC -c -Wall -O3 -ffast-math -fomit-frame-pointer -DMAEMO_CHANGES -DUSE_X11

+#CC = $(PREFIX)/bin/$(CROSS_COMPILE)gcc

+CC = $(CROSS_COMPILE)gcc

 

+CFLAGS += -fPIC # -Wall

+CFLAGS += -O3 -ffast-math -fomit-frame-pointer

+CFLAGS += -mcpu=cortex-a8 -mtune=cortex-a8

+# note: the below causes strange bugs/crashes

+#CFLAGS += -mfloat-abi=softfp

+CFLAGS += -DMAEMO_CHANGES # -DUSE_X11

+CFLAGS += -I$(PREFIX)include

 

-INCLUDE = -I$(PREFIX)/include

-LINK = $(PREFIX)/bin/$(TARGET)gcc

-LINKFLAGS = -shared -Wl,-soname,libgpuGLES.so -o libgpuGLES.so.1.0.0

-OBJ =   gpuDraw.o gpuFps.o gpuPlugin.o gpuPrim.o gpuTexture.o

+TARGET = gpuGLES.so

+LDFLAGS += -shared -Wl,-soname,$(TARGET) -o $(TARGET)

+LIB = -L$(PREFIX)lib -lGLES_CM -lX11 -lXau -lXdmcp

 

-LIB = -L$(PREFIX)/lib -lGLES_CM -lX11 -lXau -lXdmcp -lstdc++

-

-##############################################################################

-# 2. MAIN RULE

-##############################################################################

+OBJ = gpuDraw.o gpuFps.o gpuPlugin.o gpuPrim.o gpuTexture.o

 

-gpuPeopsMesaGL :	$(OBJ)

-		$(LINK) $(LINKFLAGS) $(OBJ) $(LIB)

+all: $(TARGET)

 

-##############################################################################

-# 3. GENERAL RULES

-##############################################################################

-

-%.o     : %.c

-	$(CC) $(CCFLAGS) $(INCLUDE) $<

-

-##############################################################################

-# 4. SPECIFIC RULES

-##############################################################################

+$(TARGET): $(OBJ)

+	$(CC) $(LDFLAGS) $(OBJ) $(LIB)

 

 clean:

-	rm *.o libgpuGLES.so*
\ No newline at end of file
+	$(RM) $(TARGET) $(OBJ)