aboutsummaryrefslogtreecommitdiff
path: root/emulators/skyeye/files/patch-Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'emulators/skyeye/files/patch-Makefile')
-rw-r--r--emulators/skyeye/files/patch-Makefile34
1 files changed, 19 insertions, 15 deletions
diff --git a/emulators/skyeye/files/patch-Makefile b/emulators/skyeye/files/patch-Makefile
index 0d9b394b156a..97ab50c6c180 100644
--- a/emulators/skyeye/files/patch-Makefile
+++ b/emulators/skyeye/files/patch-Makefile
@@ -1,20 +1,15 @@
---- Makefile.orig Sat Aug 5 02:33:20 2006
-+++ Makefile Sun Aug 27 15:00:42 2006
-@@ -56,11 +56,11 @@
- DEVICE_CFLAGS = -I device/ -I device/net -I device/lcd -I device/flash
- UTILS_CFLAGS = -I utils/share -I utils/main -I utils/config -I utils/debugger
- SIM_EXTRA_CFLAGS = -DMODET $(ARCH_ARM_CFLAGS) $(ARCH_BLACKFIN_CFLAGS) $(ARCH_COLDFIRE_CFLAGS) $(DEVICE_CFLAGS) $(UTILS_CFLAGS)
--SIM_EXTRA_LIBS = `pkg-config gtk+-2.0 --libs`
-+SIM_EXTRA_LIBS = `pkg-config gtk+-2.0 --libs` -L$(LOCALBASE)/lib
- #for debug
- #CFLAGS = -g -DSTANDALONE -DDEFAULT_INLINE=0 -DMODET $(SIM_EXTRA_CFLAGS) $(SUPPORT_ARCH_DEF) -I. -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/X11R6/include -I/usr/include/atk-1.0 -I/usr/include/pango-1.0 -I/usr/include/freetype2 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include
- #for speed
--CFLAGS = -g -O2 -DSTANDALONE -DDEFAULT_INLINE=0 -DMODET $(SIM_EXTRA_CFLAGS) $(SUPPORT_ARCH_DEF) -I. -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/X11R6/include -I/usr/include/atk-1.0 -I/usr/include/pango-1.0 -I/usr/include/freetype2 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include
-+CFLAGS = -g -O2 -fno-strict-aliasing -DSTANDALONE -DDEFAULT_INLINE=0 -DMODET $(SIM_EXTRA_CFLAGS) $(SUPPORT_ARCH_DEF) -I. -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/X11R6/include -I/usr/include/atk-1.0 -I/usr/include/pango-1.0 -I/usr/include/freetype2 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I$(LOCALBASE)/include
+--- Makefile.orig Thu Dec 21 16:55:34 2006
++++ Makefile Thu Dec 21 16:59:30 2006
+@@ -85,7 +85,7 @@
+ endif
+ endif
+
+-CFLAGS = -g -O2 -D_FILE_OFFSET_BITS=64 -DSTANDALONE -DDEFAULT_INLINE=0 -DMODET $(EXTRA_CFLAGS) $(SIM_EXTRA_CFLAGS) $(SUPPORT_ARCH_DEF) -I.
++CFLAGS = -g -O2 -fno-strict-aliasing -D_FILE_OFFSET_BITS=64 -DSTANDALONE -DDEFAULT_INLINE=0 -DMODET $(EXTRA_CFLAGS) $(SIM_EXTRA_CFLAGS) $(SUPPORT_ARCH_DEF) -I. -I$(LOCALBASE)/include
ARM_COMMON_PATH= arch/arm/common
ARM_DBCT_PATH= arch/arm/dbct
-@@ -161,7 +161,7 @@
+@@ -238,7 +238,7 @@
rm -f binary/*.o
rm -f binary/*.a
rm -f binary/skyeye
@@ -23,7 +18,7 @@
distclean mostlyclean maintainer-clean realclean: clean
rm -f TAGS tags
-@@ -193,7 +193,7 @@
+@@ -276,7 +276,7 @@
CF_COMMON_PATH = arch/coldfire/common/
COLDFIRE_FLAG = -I arch/coldire/tracer
binary/libcoldfire.a:$(SIM_CF_OBJS)
@@ -32,3 +27,12 @@
$(AR) $(AR_FLAGS) binary/libcoldfire.a $(SIM_CF_OBJS) $(CF_COMMON_PATH)/*.o $(CF_PATH)/tracer/tracer.o $(CF_PATH)/i_5206/i.o
$(RANLIB) binary/libcoldfire.a
+@@ -285,7 +285,7 @@
+ PPC_COMMON_PATH = arch/ppc/common/
+ POWERPC_FLAG = -I arch/ppc/common/
+ binary/libppc.a:
+- make -C arch/ppc
++ $(MAKE) -C arch/ppc
+ $(AR) $(AR_FLAGS) binary/libppc.a $(PPC_COMMON_PATH)/*.o
+ $(RANLIB) binary/ppc.a
+