From 791c4232861dc97f021aed2172107c543cdad017 Mon Sep 17 00:00:00 2001 From: Nishi Date: Wed, 18 Sep 2024 10:14:25 +0000 Subject: [PATCH] add resources git-svn-id: file:///raid/svn-personal/tewi/trunk@48 8739d7e6-ffea-ec47-b151-bdff447c6205 --- Platform/win32.mk | 2 ++ Platform/win64.mk | 2 ++ Server/Makefile | 5 ++++- Server/tewi.ico | Bin 0 -> 16958 bytes Server/tewi.rc | 11 +++++++++++ 5 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 Server/tewi.ico create mode 100644 Server/tewi.rc diff --git a/Platform/win32.mk b/Platform/win32.mk index 2b0f554..d40fb64 100644 --- a/Platform/win32.mk +++ b/Platform/win32.mk @@ -4,8 +4,10 @@ PREFIX = C:/Tewi CC = i686-w64-mingw32-gcc AR = i686-w64-mingw32-ar +WINDRES = i686-w64-mingw32-windres CFLAGS = -g -std=c99 -DPREFIX=\"$(PREFIX)\" -I $(PWD)/Common -fPIC LDFLAGS = LIBS = -lws2_32 EXEC = .exe LIB = .dll +PREOBJS = tewi.res diff --git a/Platform/win64.mk b/Platform/win64.mk index f3faf76..187462a 100644 --- a/Platform/win64.mk +++ b/Platform/win64.mk @@ -4,8 +4,10 @@ PREFIX = C:/Tewi CC = x86_64-w64-mingw32-gcc AR = x86_64-w64-mingw32-ar +WINDRES = x86_64-w64-mingw32-windres CFLAGS = -g -std=c99 -DPREFIX=\"$(PREFIX)\" -I $(PWD)/Common -fPIC LDFLAGS = LIBS = -lws2_32 EXEC = .exe LIB = .dll +PREOBJS = tewi.res diff --git a/Server/Makefile b/Server/Makefile index 78109d9..c746f1d 100644 --- a/Server/Makefile +++ b/Server/Makefile @@ -5,7 +5,7 @@ include $(PWD)/Platform/$(PLATFORM).mk .PHONY: all clean .SUFFIXES: .c .o -OBJS = version.o main.o config.o server.o http.o module.o strptime.o $(EXTOBJS) +OBJS = version.o main.o config.o server.o http.o module.o strptime.o $(EXTOBJS) $(PREOBJS) all: tewi$(EXEC) @@ -15,5 +15,8 @@ tewi$(EXEC): $(OBJS) ../Common/common.a .c.o: $(CC) $(CFLAGS) $(EXTCFLAGS) -c -o $@ $< +tewi.res: tewi.rc tewi.ico + $(WINDRES) tewi.rc -O coff -o $@ + clean: rm -f *.o tewi *.exe diff --git a/Server/tewi.ico b/Server/tewi.ico new file mode 100644 index 0000000000000000000000000000000000000000..0d2abef13e24edadfc33140769ec76f355b2e0c2 GIT binary patch literal 16958 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 literal 0 HcmV?d00001 diff --git a/Server/tewi.rc b/Server/tewi.rc new file mode 100644 index 0000000..e021640 --- /dev/null +++ b/Server/tewi.rc @@ -0,0 +1,11 @@ +id ICON "./tewi.ico" +VS_VERSION_INFO VERSIONINFO +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904E4" + BEGIN + VALUE "ProductName", "Tewi HTTPd\0" + END + END +END