From 6fb9baf71f027081f230970ff1378267688adbe2 Mon Sep 17 00:00:00 2001
From: "simon.kagstrom" <simon.kagstrom@gmail.com>
Date: Sat, 20 Mar 2010 07:19:32 +0000
Subject: [PATCH] Fix workbench stuff, release

---
 CHANGES.wii            |  7 +++++++
 Makefile.wii           | 24 ++++++++++++++++++++++--
 meta.xml               |  6 +++---
 src/tools/Makefile.wii |  4 ++--
 4 files changed, 34 insertions(+), 7 deletions(-)

diff --git a/CHANGES.wii b/CHANGES.wii
index f074baa..e60ca2c 100644
--- a/CHANGES.wii
+++ b/CHANGES.wii
@@ -1,3 +1,10 @@
+version 5:
+		* (build) Update to devkitpro r20 and the new SDL-wii trunk
+
+		* Fix workbench graphics (thanks Fredric QJ Blåholtz)
+
+		-- Simon Kagstrom <simon.kagstrom@gmail.com>, Tue Oct 20 19:30:35 CEST 2009
+
 version 4:
 		* (build) Update to devkitpro r18 and the new SDL-wii trunk
 
diff --git a/Makefile.wii b/Makefile.wii
index fac7950..6ae593e 100644
--- a/Makefile.wii
+++ b/Makefile.wii
@@ -36,6 +36,8 @@ SRCS := $(filter-out src/compemu_raw_x86.c src/compemu_fpp.c src/compemu_support
 	src/enforcer.c src/ar.c src/debug.c \
 	src/readdisk.c src/gengenblitter.c src/scsiemul.c src/tui.c src/linetoscr.c, $(SRCS))
 
+genlinetoscr_args="-b"
+
 # Library object files.
 OBJS	:= $(subst $(SRC_DIR),$(OBJ_DIR),$(SRCS:.c=.o)) $(OBJ_DIR)/guidep/VirtualKeyboard.o
 
@@ -43,6 +45,9 @@ OBJS	:= $(subst $(SRC_DIR),$(OBJ_DIR),$(SRCS:.c=.o)) $(OBJ_DIR)/guidep/VirtualKe
 # It can be useful to switch this variable around to select individual tests which are problematic.
 TEST_SRCS	:= $(TEST_SRC_DIR)/showfont.c
 
+src/tools/linetoscr:
+	cd src/tools/ && make -f Makefile.wii
+
 # What's a full build?
 all: uae.dol
 
@@ -93,6 +98,21 @@ src/md-fpp.h:
 	rm -f $@
 	cd src && ln -s include/fpp-ieee.h md-fpp.h
 
+src/blit.h:	src/tools/genblitter
+		src//tools/genblitter i >$@
+
+src/blitfunc.c: src/tools/genblitter src/blitfunc.h
+		src/tools/genblitter f >$@
+
+src/blitfunc.h: src/tools/genblitter
+		src/tools/genblitter h >$@
+
+src/blittable.c:  src/tools/genblitter src/blitfunc.h
+		src/tools/genblitter t >$@
+
+src/linetoscr.c:    src/tools/genlinetoscr
+		src/tools/genlinetoscr $(genlinetoscr_args) >$@
+
 %.h: %.h.wii
 	cp $< $@
 
@@ -107,7 +127,7 @@ $(LIB_DIR)/libSDL_ttf.a: $(OBJS)
 	@echo ----
 
 # How to build a DOL.
-$(BIN_DIR)/%.dol: %.elf
+uae.dol: uae.elf
 	@echo Creating DOL $@
 	@-mkdir -p $(dir $@)
 	#powerpc-gekko-objcopy -O binary $< $@
@@ -147,7 +167,7 @@ dist: uae.dol
 	cd $@ && tar -czf ../uae-bin.tar.gz *
 
 # How to link an ELF.
-uae.elf: $(SYMLINKS) src/target.h src/md-fpp.h src/sysconfig.h $(OBJS)
+uae.elf: src/tools/linetoscr src/blit.h src/blitfunc.c src/blitfunc.h src/blittable.c src/linetoscr.c $(SYMLINKS) src/target.h src/md-fpp.h src/sysconfig.h $(OBJS)
 	@echo Linking $@
 	@-mkdir -p $(dir $@)
 	$(CXX) -o $@ $(OBJS) $(LDFLAGS)
diff --git a/meta.xml b/meta.xml
index c4e0628..d57fcac 100644
--- a/meta.xml
+++ b/meta.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-  <app version="4">
+  <app version="5">
     <name>UAE</name>
     <coder>Simon Kagstrom</coder>
-    <version>4</version>
-    <release_date>20091021</release_date>
+    <version>5</version>
+    <release_date>20100320</release_date>
     <short_description>Amiga emulator</short_description>
     <long_description>UAE is an Amiga emulator written by Bernd Schmidt et al, see http://amigaemulator.org. The port to Wii was done by Simon Kagstrom, with help from Christopher Follett and "Knitax"</long_description>
   </app>
diff --git a/src/tools/Makefile.wii b/src/tools/Makefile.wii
index 0a0e38d..f11128e 100644
--- a/src/tools/Makefile.wii
+++ b/src/tools/Makefile.wii
@@ -4,7 +4,7 @@
 
 CC        = gcc
 LDFLAGS   =
-CFLAGS    =
+CFLAGS    = -I../include
 LIBRARIES =
 
 all: gencpu gencomp build68k genblitter genlinetoscr
@@ -38,7 +38,7 @@ custom.o: blit.h
 drawing.o: linetoscr.c
 
 cpudefs.c: build68k ../table68k
-	./build68k ../table68k >cpudefs.c
+	./build68k < ../table68k >cpudefs.c
 
 .c.o:
 	$(CC) $(INCLUDES) -c $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $(DEBUGFLAGS) $(CFLAGS_$@) $< -o $@