From 20115e1b1a0d3a0911760ab2543bfc44930dfd0a Mon Sep 17 00:00:00 2001 From: FunkyFr3sh Date: Mon, 8 Apr 2019 04:16:20 +0200 Subject: [PATCH] makefile tweaks --- Makefile | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 99e6501..38ff64f 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,9 @@ -CC=gcc -WINDRES=windres -CFLAGS=-Iinc -Wall -Wl,--enable-stdcall-fixup -s -LIBS=-lgdi32 -lwinmm +-include config.mk + +WINDRES ?= windres +LDFLAGS = -Iinc -Wall -Wl,--enable-stdcall-fixup -s +CFLAGS = -std=c99 +LIBS = -lgdi32 -lwinmm FILES = src/debug.c \ src/main.c \ @@ -21,8 +23,8 @@ FILES = src/debug.c \ all: $(WINDRES) -J rc ddraw.rc ddraw.rc.o - $(CC) $(CFLAGS) -shared -o ddraw.dll $(FILES) ddraw.def ddraw.rc.o $(LIBS) -# $(CC) $(CFLAGS) -nostdlib -shared -o ddraw.dll $(FILES) ddraw.def ddraw.rc.o $(LIBS) -lkernel32 -luser32 -lmsvcrt + $(CC) $(CFLAGS) $(LDFLAGS) -shared -o ddraw.dll $(FILES) ddraw.def ddraw.rc.o $(LIBS) +# $(CC) $(CFLAGS) $(LDFLAGS) -nostdlib -shared -o ddraw.dll $(FILES) ddraw.def ddraw.rc.o $(LIBS) -lkernel32 -luser32 -lmsvcrt clean: - rm -f ddraw.dll + $(RM) -f ddraw.dll ddraw.rc.o