qi-hardware/openwrt-packages
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-packages.git synced 2024-11-21 23:18:27 +02:00
Code

pmars: fix compile error, remove static CC ... in Makefile

Browse Source
This commit is contained in:
Xiangfu Liu 2011-01-17 13:21:00 +08:00
parent 40912c6c07
commit 3259de09a4
2 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pmars/Makefile
View File

@ -16,8 +16,8 @@ define Package/pmars
TITLE:=Pmars TITLE:=Pmars
SECTION:=games SECTION:=games
CATEGORY:=Games CATEGORY:=Games
DEPENDS:=@BROKEN DEPENDS:=+libncurses
URL:= URL:=http://corewar.co.uk/pmars/
endef endef
PKG_BUILD_DIR:=$(BUILD_DIR)/pmars-$(PKG_VERSION) PKG_BUILD_DIR:=$(BUILD_DIR)/pmars-$(PKG_VERSION)
define Package/pmars/description define Package/pmars/description
@ -29,10 +29,6 @@ TARGET_LDFLAGS+= \
MAKE_FLAGS += -C src MAKE_FLAGS += -C src
define Package/pmars/Build/Compile
$(call Build/Compile/Default)
endef
define Package/pmars/install define Package/pmars/install
$(INSTALL_DIR) $(1)/usr/bin $(INSTALL_DIR) $(1)/usr/bin
$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/pmars $(1)/usr/bin/ $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/pmars $(1)/usr/bin/

15
pmars/patches/001-remove-static-define-in-makefile.patch
View File

@ -1,5 +1,5 @@
diff --git a/src/Makefile b/src/Makefile diff --git a/src/Makefile b/src/Makefile
index 99c00bb..17a51ed 100644 index 99c00bb..0630be1 100644
--- a/src/Makefile --- a/src/Makefile
+++ b/src/Makefile +++ b/src/Makefile
@@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
@ -9,7 +9,7 @@ index 99c00bb..17a51ed 100644
#CC = cc # if you don't have gcc #CC = cc # if you don't have gcc
# Configuration options: # Configuration options:
# #
@@ -16,11 +16,11 @@ CC = gcc # req. for linux @@ -16,11 +16,12 @@ CC = gcc # req. for linux
# (6) -DXWINGRAPHX 1 X-Windows graphics (UNIX) # (6) -DXWINGRAPHX 1 X-Windows graphics (UNIX)
# (7) -DPERMUTATE enables -P switch # (7) -DPERMUTATE enables -P switch
@ -17,19 +17,22 @@ index 99c00bb..17a51ed 100644
+CFLAGS := $(CFLAGS) -O -DEXT94 -DPERMUTATE -DCURSESGRAPHX +CFLAGS := $(CFLAGS) -O -DEXT94 -DPERMUTATE -DCURSESGRAPHX
LFLAGS = -x LFLAGS = -x
-# LIB = -lcurses -ltermlib # enable this one for curses display -# LIB = -lcurses -ltermlib # enable this one for curses display
+LIB = -lncurses -ltermlib # enable this one for curses display +# LIB = -lncurses -ltermlib # enable this one for curses display
+LIB = -lncurses
# LIB = -lvgagl -lvga # enable this one for Linux/SVGA # LIB = -lvgagl -lvga # enable this one for Linux/SVGA
-LIB = -L/usr/X11R6/lib -lX11 # enable this one for X11 -LIB = -L/usr/X11R6/lib -lX11 # enable this one for X11
+# LIB = -L/usr/X11R6/lib -lX11 # enable this one for X11 +# LIB = -L/usr/X11R6/lib -lX11 # enable this one for X11
.SUFFIXES: .o .c .c~ .man .doc .6 .SUFFIXES: .o .c .c~ .man .doc .6
MAINFILE = pmars MAINFILE = pmars
@@ -38,7 +38,7 @@ flags: @@ -37,8 +38,8 @@ flags:
$(MAINFILE): $(OBJ1) $(OBJ2) $(OBJ3) $(MAINFILE): $(OBJ1) $(OBJ2) $(OBJ3)
@echo Linking $(MAINFILE) @echo Linking $(MAINFILE)
@$(CC) -o $(MAINFILE) $(OBJ1) $(OBJ2) $(OBJ3) $(LIB) - @$(CC) -o $(MAINFILE) $(OBJ1) $(OBJ2) $(OBJ3) $(LIB)
- @strip $(MAINFILE) - @strip $(MAINFILE)
+ @$(STRIP) $(MAINFILE) + $(CC) $(CFLAGS) $(LDFLAGS) -o $(MAINFILE) $(OBJ1) $(OBJ2) $(OBJ3) $(LIB)
+ $(STRIP) $(MAINFILE)
@echo done @echo done
token.o asm.o disasm.o: asm.h token.o asm.o disasm.o: asm.h