add resource

git-svn-id: file:///raid/svn-main/nishi-dataworks/trunk@130 d4a5a174-5a4a-5b4b-b672-37683c10d7d5

diff --git a/Client/Makefile b/Client/Makefile
index f43084b605a000afba75521b9dd00671a60fc1c0..3c9a0282f460d31d5284972ec512d6beda0bb88d 100644 (file)
--- 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 (file)
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 1d209e68db8963ee7cbd6515aa97cbadde105fab..261630d83405ad23a139d87daa0f7f75bcb5c29b 100644 (file)
--- 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 5dbfd89788c05167d1e0742239a619d46ea99bd6..3c460639e385aa9793d83132cb287e813343c68a 100644 (file)
--- 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 012e12d03eca372c08914a8925bf718a8fe70682..64d97d888348da600faa14634bad60ae5b091b50 100644 (file)
--- 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 09fc7b68b5be21d0f1880ea5bdc229ea2df9f658..36a7652b814a0df47306b2cf8c020d7268f121fe 100644 (file)
--- 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 (file)
index 0000000..dcc6e27
Binary files /dev/null and b/dataworks.ico differ