From ec04efd0e1891ba04a47ff19783bdb28c4a8c8e7 Mon Sep 17 00:00:00 2001 From: nishi Date: Tue, 28 May 2024 23:41:42 +0000 Subject: [PATCH] add resource git-svn-id: file:///raid/svn-main/nishi-dataworks/trunk@130 d4a5a174-5a4a-5b4b-b672-37683c10d7d5 --- Client/Makefile | 5 ++++- Client/dataworks.rc | 12 ++++++++++++ Platforms/win32.mk | 2 ++ Platforms/win64.mk | 2 ++ common-decl.mk | 1 + common.mk | 2 +- dataworks.ico | Bin 0 -> 3774 bytes 7 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 Client/dataworks.rc create mode 100644 dataworks.ico diff --git a/Client/Makefile b/Client/Makefile index f43084b..3c9a028 100644 --- a/Client/Makefile +++ b/Client/Makefile @@ -10,8 +10,11 @@ all: dataworks$(EXEC_SUFFIX) dataworks$(EXEC_SUFFIX): $(OBJS) $(LINK_LIB) $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) $(LINK_LIB) +dataworks.res: dataworks.rc + $(WINDRES) ./dataworks.rc -O coff -o ./dataworks.res + .c.o: $(CC) -I../Library $(CFLAGS) -c -o $@ $< clean: - rm -f *.o dataworks *.exe *.dos *.dos4g *.com + rm -f *.o dataworks *.exe *.com *.res diff --git a/Client/dataworks.rc b/Client/dataworks.rc new file mode 100644 index 0000000..717172f --- /dev/null +++ b/Client/dataworks.rc @@ -0,0 +1,12 @@ +id ICON "../dataworks.ico" +VS_VERSION_INFO VERSIONINFO +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "000004b0" + BEGIN + VALUE "ProductName", "DataWorks\0" + END + END +END + diff --git a/Platforms/win32.mk b/Platforms/win32.mk index 1d209e6..261630d 100644 --- a/Platforms/win32.mk +++ b/Platforms/win32.mk @@ -4,6 +4,7 @@ CC = i686-w64-mingw32-gcc SHCC = i686-w64-mingw32-gcc AR = i686-w64-mingw32-ar RANLIB = i686-w64-mingw32-ranlib +WINDRES = i686-w64-mingw32-windres LIB_PREFIX = LIB_SUFFIX = .dll EXEC_SUFFIX = .exe @@ -12,3 +13,4 @@ STATICLIB_SUFFIX = .a PLATFORM_M = i686 PLATFORM_P = i686 LDFLAGS += -Wl,--out-implib,./dataworks.lib +LINK_LIB += dataworks.res diff --git a/Platforms/win64.mk b/Platforms/win64.mk index 5dbfd89..3c46063 100644 --- a/Platforms/win64.mk +++ b/Platforms/win64.mk @@ -4,6 +4,7 @@ CC = x86_64-w64-mingw32-gcc SHCC = x86_64-w64-mingw32-gcc AR = x86_64-w64-mingw32-ar RANLIB = x86_64-w64-mingw32-ranlib +WINDRES = x86_64-w64-mingw32-windres LIB_PREFIX = LIB_SUFFIX = .dll EXEC_SUFFIX = .exe @@ -12,3 +13,4 @@ STATICLIB_SUFFIX = .a PLATFORM_M = x86_64 PLATFORM_P = x86_64 LDFLAGS += -Wl,--out-implib,./dataworks.lib +LINK_LIB += dataworks.res diff --git a/common-decl.mk b/common-decl.mk index 012e12d..64d97d8 100644 --- a/common-decl.mk +++ b/common-decl.mk @@ -5,6 +5,7 @@ SHCC = cc AR = ar AR_ARGS = rcs \$$@ RANLIB = ranlib +WINDRES = windres CFLAGS = -g -std=c99 -D_DEFAULT_SOURCE LDFLAGS = -L`pwd`/Library LIBS = diff --git a/common.mk b/common.mk index 09fc7b6..36a7652 100644 --- a/common.mk +++ b/common.mk @@ -1,6 +1,6 @@ # $Id$ -COMPILE_FLAGS = CC="$(CC)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" LIBS="$(LIBS)" LIB_PREFIX="$(LIB_PREFIX)" LIB_SUFFIX="$(LIB_SUFFIX)" EXEC_SUFFIX="$(EXEC_SUFFIX)" PLATFORM_M="$(PLATFORM_M)" PLATFORM_P="$(PLATFORM_P)" STATICLIB_PREFIX="$(STATICLIB_PREFIX)" STATICLIB_SUFFIX="$(STATICLIB_SUFFIX)" AR="$(AR)" RANLIB="$(RANLIB)" SHCC="$(SHCC)" LINK_LIB="$(LINK_LIB)" AR_ARGS="$(AR_ARGS)" +COMPILE_FLAGS = CC="$(CC)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" LIBS="$(LIBS)" LIB_PREFIX="$(LIB_PREFIX)" LIB_SUFFIX="$(LIB_SUFFIX)" EXEC_SUFFIX="$(EXEC_SUFFIX)" PLATFORM_M="$(PLATFORM_M)" PLATFORM_P="$(PLATFORM_P)" STATICLIB_PREFIX="$(STATICLIB_PREFIX)" STATICLIB_SUFFIX="$(STATICLIB_SUFFIX)" AR="$(AR)" RANLIB="$(RANLIB)" SHCC="$(SHCC)" LINK_LIB="$(LINK_LIB)" AR_ARGS="$(AR_ARGS)" WINDRES="$(WINDRES)" .PHONY: all no-doc replace format clean ./Library ./Client ./Document archive archive-prepare archive-cleanup archive-targz archive-zip dosbox prepare-dosbox dosbox-x cleanup-dosbox diff --git a/dataworks.ico b/dataworks.ico new file mode 100644 index 0000000000000000000000000000000000000000..dcc6e27f511d3303f083e45c6354528bf161ba26 GIT binary patch literal 3774 zcmeH~ziU%b6vxlI_dzS7O_ShM=zBJU}is7e|)~@*Gq>GCHQlW@VQ7I?h`#A zqDOe+h+g2$=VEt=ns@b$L%tyIJ)NH%)5+&u+S)p&&EvPU_ivFL7>4?6Z9#ofetcIKK>HO?;4stf~eErSri`&!N3H-kk z$nzWZp7(Dg$oqXL=Fjl&^ZCvC<%X}FPyGh5#jc*qgmX7_k>?p`)zmKJk>t)rwKAOv zT~`1?7^0YuW7l(B<;&P8$c7HsX;l@k-xbg>&0yJTijqeFgvc`|be8q4U0dVVv?Av7 z95BbuGGj8^5`KoF&;25}a}G2#hRwEG9G^{7fY3gK2gkI;P7-4h+p_#Bc_Tfmg2!3L zPGHO<0ZiJ+`jRqI;Bm3Wm}avHy4j2s7Mp}$MGg!`GC0OXBR=G?I2FEB2#xUI3mO8+ zfr9#`nII|GSt=NI4vCqo%ov+uUJ}0$a2LcGq_tRKOegK6=v9m4E|36oC0Nc6h$mhs zjA?h6H|R5@mA-|Bz^)ZfR0C$I@;a|jBcvRh4e`q-in^T(ycALO74ZHGUiO zoJ}LX1oG?wjbHCVI_7hrM z3SQ=t-kl})py?ab{za=@P63adHfV}91YZ8c=g`Dd$}UNGq=a;H^vj$ Hd(QI*9aA%W literal 0 HcmV?d00001 -- 2.43.0