Lines 1-17
Link Here
|
1 |
--- Makefile.orig Mon Dec 5 09:52:42 2005 |
1 |
--- Makefile.orig Sat Aug 5 02:33:20 2006 |
2 |
+++ Makefile Fri Jan 20 01:44:58 2006 |
2 |
+++ Makefile Sun Aug 27 15:00:42 2006 |
3 |
@@ -53,8 +53,8 @@ |
3 |
@@ -56,11 +56,11 @@ |
4 |
ARCH_COLDFIRE_CFLAGS = -I arch/coldfire/common |
|
|
5 |
DEVICE_CFLAGS = -I device/ -I device/net -I device/lcd -I device/flash |
4 |
DEVICE_CFLAGS = -I device/ -I device/net -I device/lcd -I device/flash |
6 |
UTILS_CFLAGS = -I utils/share -I utils/main -I utils/config |
5 |
UTILS_CFLAGS = -I utils/share -I utils/main -I utils/config -I utils/debugger |
7 |
-SIM_EXTRA_CFLAGS = -DMODET $(ARCH_ARM_CFLAGS) $(ARCH_BLACKFIN_CFLAGS) $(ARCH_COLDFIRE_CFLAGS) $(DEVICE_CFLAGS) $(UTILS_CFLAGS) |
6 |
SIM_EXTRA_CFLAGS = -DMODET $(ARCH_ARM_CFLAGS) $(ARCH_BLACKFIN_CFLAGS) $(ARCH_COLDFIRE_CFLAGS) $(DEVICE_CFLAGS) $(UTILS_CFLAGS) |
8 |
-SIM_EXTRA_LIBS = `pkg-config gtk+-2.0 --libs` |
7 |
-SIM_EXTRA_LIBS = `pkg-config gtk+-2.0 --libs` |
9 |
+SIM_EXTRA_CFLAGS = -DMODET $(ARCH_ARM_CFLAGS) $(ARCH_BLACKFIN_CFLAGS) $(ARCH_COLDFIRE_CFLAGS) $(DEVICE_CFLAGS) $(UTILS_CFLAGS) `pkg-config gtk+-2.0 --cflags` -I${LOCALBASE}/include |
8 |
+SIM_EXTRA_LIBS = `pkg-config gtk+-2.0 --libs` -L$(LOCALBASE)/lib |
10 |
+SIM_EXTRA_LIBS = `pkg-config gtk+-2.0 --libs` -L${LOCALBASE}/lib |
9 |
#for debug |
11 |
#CFLAGS = -g -DSTANDALONE -DDEFAULT_INLINE=0 -DMODET $(SIM_EXTRA_CFLAGS) -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 |
10 |
#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 |
12 |
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 |
11 |
#for speed |
|
|
12 |
-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 |
13 |
+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 |
13 |
|
14 |
|
14 |
@@ -157,7 +157,7 @@ |
15 |
ARM_COMMON_PATH= arch/arm/common |
|
|
16 |
ARM_DBCT_PATH= arch/arm/dbct |
17 |
@@ -161,7 +161,7 @@ |
15 |
rm -f binary/*.o |
18 |
rm -f binary/*.o |
16 |
rm -f binary/*.a |
19 |
rm -f binary/*.a |
17 |
rm -f binary/skyeye |
20 |
rm -f binary/skyeye |
Lines 20-26
Link Here
|
20 |
|
23 |
|
21 |
distclean mostlyclean maintainer-clean realclean: clean |
24 |
distclean mostlyclean maintainer-clean realclean: clean |
22 |
rm -f TAGS tags |
25 |
rm -f TAGS tags |
23 |
@@ -189,7 +189,7 @@ |
26 |
@@ -193,7 +193,7 @@ |
24 |
CF_COMMON_PATH = arch/coldfire/common/ |
27 |
CF_COMMON_PATH = arch/coldfire/common/ |
25 |
COLDFIRE_FLAG = -I arch/coldire/tracer |
28 |
COLDFIRE_FLAG = -I arch/coldire/tracer |
26 |
binary/libcoldfire.a:$(SIM_CF_OBJS) |
29 |
binary/libcoldfire.a:$(SIM_CF_OBJS) |