From 4f3760fc3b647fa166da4ab777eb612b14ac500b Mon Sep 17 00:00:00 2001
From: Thomas Schmucker <ts@its1.de>
Date: Wed, 15 Jul 2026 21:05:19 +0200
Subject: Umbau auf modernes C++

---
 makefile | 50 +++++++++++---------------------------------------
 1 file changed, 11 insertions(+), 39 deletions(-)

(limited to 'makefile')

diff --git a/makefile b/makefile
index 637130c..12b6ad2 100644
--- a/makefile
+++ b/makefile
@@ -1,47 +1,19 @@
-EXE = bin/xml.exe
+include config.mk
 
-all: $(EXE)
+all: bin/xml_test
 
-EMPTY = 
+OBJS = obj/xml.obj obj/xml_test.obj
 
-CONTRIB = ../contrib
+bin/xml_test: $(OBJS) | bin
+	c++ $(LDFLAGS) -o $@ $(OBJS)
 
-EXPAT_DIR = $(CONTRIB)/expat-2.2.0
-EXPAT_INCLUDE_DIR = $(EXPAT_DIR)/lib
-EXPAT_LIB_DIR = $(EXPAT_DIR)/win32/bin/Release
-EXPAT_LIBS = libexpatMT.lib
+obj/%.obj: src/%.cpp | obj
+	c++ $(CXXFLAGS) -c $< -o $@
 
-OBJS = \
-	obj/xml.obj \
-	obj/xml_test.obj \
-	$(EMPTY)
-
-WIN32_LIBS = kernel32.lib comdlg32.lib user32.lib gdi32.lib ole32.lib wsock32.lib Ws2_32.lib comctl32.lib shell32.lib oleaut32.lib advapi32.lib uuid.lib Winspool.lib
-
-# === Compilereinstellungen ===
-
-CPPFLAGS=-nologo -EHsc -Ox -MT -W4 -WX -Iinclude -I$(EXPAT_INCLUDE_DIR) -DWIN32 -D_WINDOWS -D_CRT_NOFORCE_MANIFEST -D_CRT_SECURE_NO_WARNINGS -DNDEBUG
-
-# === Linkereinstellungen ===
-
-LDFLAGS=-nologo -MANIFEST:NO -LIBPATH:$(EXPAT_LIB_DIR)
-LDFLAGS2=$(WIN32_LIBS) $(EXPAT_LIBS)
-
-$(EXE): $(OBJS)
-	@echo link $@
-	@link.exe $(LDFLAGS) -out:$@ $(LDFLAGS2) $(OBJS)
-
-obj/%.obj: src/%.cpp
-	@echo compiling $@
-	cl $(CPPFLAGS) -Tp$< -c -Fo$@
-
-obj/%.obj: src/%.c
-	@echo compiling $@
-	@cl $(CPPFLAGS) -Tc$< -c -Fo$@
+bin obj:
+	mkdir -p $@
 
 clean:
-	@echo cleaning...
-	@del bin\*.exe
-	@del obj\**
-	@del *.pdb
+	rm -rf bin obj
 
+.PHONY: all clean
-- 
cgit v1.3