r1910

[dslinux_gpf at dslinux.in-berlin.de]

Author: gpf
Date: 2007-09-22 08:17:19 +0200 (Sat, 22 Sep 2007)
New Revision: 1910

Log:
Patch from Ewan Meadows(Sonny Jim) to fix pixil's nxterm and nxloadmon


Modified: trunk/user/pixil/apps/nanox/misc/Makefile
===================================================================
--- trunk/user/pixil/apps/nanox/misc/Makefile	2007-09-21 19:31:33 UTC (rev 1909)
+++ trunk/user/pixil/apps/nanox/misc/Makefile	2007-09-22 06:17:19 UTC (rev 1910)
@@ -7,7 +7,7 @@
 # Just the basic nano-X library for nxterm
 
 NXLIBS=-L$(MWDIR)/lib -lnano-X
-
+LDFLAGS=-Wl,-elf2flt -D__PIC__ -fpic -msingle-pic-base -mswp-byte-writes
 # A bit more is needed for nxclock and nxloadmon
 
 WMLIBS= -L$(STAGE_DIR)/lib -L$(MWDIR)/lib -lwm -lnano-X
@@ -19,10 +19,10 @@
 include $(BASE_DIR)/Rules.make
 
 nxloadmon: nxloadmon.o
-	$(CC) $(CFLAGS) $(INCLUDES) nxloadmon.o -o $@ $(WMLIBS)
+	$(CC) $(LDFLAGS) $(CFLAGS) $(INCLUDES) nxloadmon.o -o $@ $(WMLIBS)
 
 nxterm: nxterm.o
-	$(CC) $(CFLAGS) $(INCLUDES) nxterm.o -o $@ $(NXLIBS)
+	$(CC) $(LDFLAGS) $(CFLAGS) $(INCLUDES) nxterm.o -o $@ $(NXLIBS)
 
 install-apps: $(INSTALL_BINDIR)
 	@ cp nxloadmon nxterm $(INSTALL_BINDIR)