From 70aaa5f29ade3f13b3d83bec5ae6c6e5e90353e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?John=20Ankarstr=C3=B6m?= Date: Mon, 18 Jul 2022 01:16:59 +0200 Subject: Makefile: Add assembly target. --- .gitignore | 7 ++++--- Makefile | 15 +++++++++------ 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index e034102..4ed6a6d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ +*~ +*.db /b/ /misc/ -TAGS +/s/ deps.mk -*~ -*.db +TAGS diff --git a/Makefile b/Makefile index fee2a72..73a24a5 100644 --- a/Makefile +++ b/Makefile @@ -2,10 +2,10 @@ EXE = EpisodeBrowser.exe OBJ = b/common.obj b/datalistview.obj b/episodelistview.obj b/listview.obj b/pl.obj b/resource.obj PL = pl/cfg.pl pl/episode_data.pl pl/local_episodes.pl pl/track_episodes.pl -CC = swipl-ld -CFLAGS += -Wall -Wpedantic -O -cc-options,-std=c++17 -ld-options,-mwindows -CFLAGS += -DUNICODE -D_UNICODE -LDFLAGS += -lcomctl32 -luxtheme +CL = swipl-ld +CLFLAGS = -DUNICODE -D_UNICODE +CLFLAGS += -cc-options,-std=c++17 -Wall -Wpedantic -O +CLFLAGS += -ld-options,-mwindows -lcomctl32 -luxtheme all: showdeps b/$(EXE) cp b/$(EXE) "C:\Users\John\Desktop\Delat" @@ -17,13 +17,16 @@ TAGS: c/*.cpp c/*.h pl/*.pl etags c/*.cpp c/*.h -lprolog pl/*.pl b/$(EXE): Makefile c/main.cpp $(OBJ) $(PL) - $(CC) -v $(CFLAGS) $(LDFLAGS) -goal true -o $@ c/main.cpp $(OBJ) $(PL) + $(CL) $(CLFLAGS) -goal true -o $@ c/main.cpp $(OBJ) $(PL) b/resource.obj: c/resource.h c/resource.rc c/application.manifest windres -i c/resource.rc -o b/resource.obj b/%.obj: c/%.cpp - $(CC) -c $(CFLAGS) -o $@ $< + $(CL) -c $(CLFLAGS) -o $@ $< + +s/%.s: c/%.cpp + $(CL) $(CLFLAGS) -cc-options,-fverbose-asm,-masm=intel -S -o $@ $< # showdeps prints a short summary of which dependencies have changed, # causing which targets to be rebuilt. It is run by the `all' target -- cgit v1.2.3