fte
/
quakespasm
mirror of https://github.com/Shpoike/Quakespasm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

minor Makefile correction 

git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@712 af15c1b1-3010-417e-b628-4374ebc0bcbd
This commit is contained in:
sezero 2012-09-05 16:24:57 +00:00
parent f4564700c0
commit 771551c969
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Quake/Makefile
View File

@ -81,8 +81,8 @@ X11BASE_GUESS := $(shell \
X11BASE ?= $(X11BASE_GUESS)
ifneq ($(X11BASE),)
X11_LFLAGS := -L$(X11BASE)/lib
X11_CFLAGS := -I$(X11BASE)/include
LDFLAGS+= -L$(X11BASE)/lib
CFLAGS += -I$(X11BASE)/include
endif
SDL_CONFIG ?= sdl-config
@ -161,7 +161,7 @@ DEFAULT_TARGET := quakespasm
# ---------------------------
%.o: %.c
$(CC) $(DFLAGS) -c $(CFLAGS) $(X11_CFLAGS) $(SDL_CFLAGS) -o $@ $^
$(CC) $(DFLAGS) -c $(CFLAGS) $(SDL_CFLAGS) -o $@ $^
# ----------------------------------------------------------------------------
# objects
@ -255,7 +255,7 @@ OBJS := strlcat.o \
# ------------------------
quakespasm: $(OBJS)
$(LINKER) $(OBJS) $(X11_LFLAGS) $(LDFLAGS) $(LIBS) $(SDL_LIBS) -o $@
$(LINKER) $(OBJS) $(LDFLAGS) $(LIBS) $(SDL_LIBS) -o $@
$(call do_strip,$@)
release: quakespasm

2
Quake/Makefile.darwin
View File

@ -250,7 +250,7 @@ OBJS := strlcat.o \
# ------------------------
quakespasm: $(OBJS)
$(LINKER) $(OBJS) $(SDL_LIBS) $(LDFLAGS) $(LIBS) -o $@
$(LINKER) $(OBJS) $(LDFLAGS) $(LIBS) $(SDL_LIBS) -o $@
$(call do_strip,$@)
release: quakespasm