From 1647f4b4f9ebef8b938222b1f48d9a15cc262e97 Mon Sep 17 00:00:00 2001 From: Toni Uhlig Date: Wed, 25 Mar 2020 20:48:19 +0100 Subject: clean-up the mess Signed-off-by: Toni Uhlig --- h1z1/Makefile | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) (limited to 'h1z1/Makefile') diff --git a/h1z1/Makefile b/h1z1/Makefile index eddc463..b547102 100644 --- a/h1z1/Makefile +++ b/h1z1/Makefile @@ -7,11 +7,11 @@ TARGETS := h1z1 H1Z1_SRC := main.c ifneq ($(strip $(X64)),) -CFLAGS+=-I../libghack/CSFML-2.1-windows-64bits/CSFML-2.1/include -I../libghack/include -LDFLAGS+=-L../libghack/CSFML-2.1-windows-64bits/CSFML-2.1/lib/gcc -L../libghack/CSFML-2.1-windows-64bits/CSFML-2.1/bin -L../libghack +CFLAGS+=-Ilibghack/CSFML-2.1-windows-64bits/CSFML-2.1/include -Ilibghack/include +LDFLAGS+=-Llibghack/CSFML-2.1-windows-64bits/CSFML-2.1/lib/gcc -Llibghack/CSFML-2.1-windows-64bits/CSFML-2.1/bin -Llibghack else -CFLAGS+=-I../libghack/CSFML-2.1-windows-32bits/CSFML-2.1/include -I../libghack/include -LDFLAGS+=-L../libghack/CSFML-2.1-windows-32bits/CSFML-2.1/lib/gcc -L../libghack/CSFML-2.1-windows-32bits/CSFML-2.1/bin -L../libghack +CFLAGS+=-Ilibghack/CSFML-2.1-windows-32bits/CSFML-2.1/include -Ilibghack/include +LDFLAGS+=-Llibghack/CSFML-2.1-windows-32bits/CSFML-2.1/lib/gcc -Llibghack/CSFML-2.1-windows-32bits/CSFML-2.1/bin -Llibghack endif @@ -24,10 +24,17 @@ all: $(TARGETS) @echo 'Finished building: $<' @echo ' ' +libghack/libghack.dll: + make -C libghack -h1z1: main.o +h1z1: libghack/libghack.dll main.o @echo 'Building target: $@' @echo 'Invoking: GCC C Linker' - $(CXX) $(CFLAGS) $(LDFLAGS) -o $@ $^ -lcsfml-window -lcsfml-system -lcsfml-graphics ../libghack/libghack.dll -lpsapi + $(CXX) $(CFLAGS) $(LDFLAGS) -o $@ $^ -lcsfml-window -lcsfml-system -lcsfml-graphics libghack/libghack.dll -lpsapi @echo 'Finished building target: $@' @echo ' ' + + +clean: + $(MAKE) -C libghack clean + rm -f h1z1.exe *.o *.d -- cgit v1.2.3