diff options
| author | twinaphex | 2013-03-25 03:20:16 +0100 |
|---|---|---|
| committer | twinaphex | 2013-03-25 03:20:16 +0100 |
| commit | bcb982d5c38b25451598e9f00844a11bcd73ac74 (patch) | |
| tree | 59432441cf9e9f0a06f1079829cf70ad39d92949 /Makefile | |
| parent | de4229995f85cddc72420b1b094e022b63f3951b (diff) | |
| parent | 9aff1963cf8ca9bbba14d4c82674ad0075c604ac (diff) | |
| download | pcsx_rearmed-bcb982d5c38b25451598e9f00844a11bcd73ac74.tar.gz pcsx_rearmed-bcb982d5c38b25451598e9f00844a11bcd73ac74.tar.bz2 pcsx_rearmed-bcb982d5c38b25451598e9f00844a11bcd73ac74.zip | |
Merge branch 'mainline'
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 16 |
1 files changed, 11 insertions, 5 deletions
@@ -1,9 +1,8 @@ # Makefile for PCSX ReARMed # default stuff goes here, so that config can override -TARGET = pcsx +TARGET ?= pcsx CFLAGS += -Wall -ggdb -Iinclude -ffast-math -LDLIBS += -lpthread ifndef DEBUG CFLAGS += -O2 -DNDEBUG endif @@ -13,6 +12,7 @@ CXXFLAGS += $(CFLAGS) all: config.mak target_ plugins_ +ifndef NO_CONFIG_MAK ifneq ($(wildcard config.mak),) config.mak: ./configure @echo $@ is out-of-date, running configure @@ -23,10 +23,16 @@ config.mak: @echo "Please run ./configure before running make!" @exit 1 endif +else # NO_CONFIG_MAK +config.mak: +endif + -include Makefile.local -CC_LINK = $(CC) +CC_LINK ?= $(CC) +CC_AS ?= $(CC) LDFLAGS += $(MAIN_LDFLAGS) +EXTRA_LDFLAGS ?= -Wl,-Map=$@.map LDLIBS += $(MAIN_LDLIBS) ifdef PCNT CFLAGS += -DPCNT @@ -228,13 +234,13 @@ frontend/revision.h: FORCE @rm $@_ %.o: %.S - $(CC) $(CFLAGS) -c $^ -o $@ + $(CC_AS) $(CFLAGS) -c $^ -o $@ target_: $(TARGET) $(TARGET): $(OBJS) - $(CC_LINK) -o $@ $^ $(LDFLAGS) $(LDLIBS) -Wl,-Map=$@.map + $(CC_LINK) -o $@ $^ $(LDFLAGS) $(LDLIBS) $(EXTRA_LDFLAGS) clean: $(PLAT_CLEAN) clean_plugins $(RM) $(TARGET) $(OBJS) $(TARGET).map frontend/revision.h |