From 6dabe0a9956100e9d38d60f9f013ccffdf89afb1 Mon Sep 17 00:00:00 2001 From: insofaras Date: Tue, 8 Mar 2016 23:35:00 +0000 Subject: [PATCH] fix the makefile --- Makefile | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/Makefile b/Makefile index fb803c70..8a34060c 100755 --- a/Makefile +++ b/Makefile @@ -2,25 +2,25 @@ CPP_FILES := $(wildcard *.cpp) $(wildcard **/*.cpp) H_FILES := $(wildcard *.h) $(wildcard **/*.h) WARNINGS := -Wno-write-strings PLAT_LINKS := -L/usr/local/lib -lX11 -lpthread -lm -lrt -lGL -ldl -lXfixes -FLAGS := -fPIC -fno-threadsafe-statics -pthread +FLAGS := -fPIC -fno-threadsafe-statics -pthread -I../foreign -all: 4ed_app.so 4ed +all: ../4ed_app.so ../4ed -4ed_app.so: $(CPP_FILES) $(H_FILES) - g++ $(WARNINGS) $(FLAGS) -std=gnu++0x -shared code/4ed_app_target.cpp -iquoteforeign -o 4ed_app.so +../4ed_app.so: $(CPP_FILES) $(H_FILES) + g++ $(WARNINGS) $(FLAGS) -std=gnu++0x -shared 4ed_app_target.cpp -iquoteforeign -o $@ -4ed: $(CPP_FILES) $(H_FILES) - g++ $(WARNINGS) $(FLAGS) -std=gnu++0x code/linux_4ed.cpp -iquoteforeign $(PLAT_LINKS) -o $@ +../4ed: $(CPP_FILES) $(H_FILES) + g++ $(WARNINGS) $(FLAGS) -std=gnu++0x linux_4ed.cpp -iquoteforeign $(PLAT_LINKS) -o $@ clean: - $(RM) -f 4ed_app.so 4ed + $(RM) -f ../4ed_app.so ../4ed -release: FLAGS += -U_FORTIFY_SOURCE -fno-stack-protector -Wl,--wrap=memcpy code/linux_release_compat.c -Wl,-s -release: 4ed_app.so 4ed +release: FLAGS += -U_FORTIFY_SOURCE -fno-stack-protector -Wl,--wrap=memcpy linux_release_compat.c -Wl,-s +release: ../4ed_app.so ../4ed strip -R .comment $^ release32: FLAGS += -U_FORTIFY_SOURCE -fno-stack-protector -Wl,-s -m32 -release32: 4ed_app.so 4ed +release32: ../4ed_app.so ../4ed strip -R .comment $^ release_super: FLAGS += -D FRED_SUPER @@ -29,6 +29,6 @@ release_super: release release32_super: FLAGS += -D FRED_SUPER release32_super: release32 -.PHONY: clean release release32 +.PHONY: clean release release32 release_super release32_super