added icon to win32 build

pjshumphreys · Oct 18, 2019 · 8f110b9 · 8f110b9
1 parent 0ba7301
commit 8f110b9
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 1 deletion.
diff --git a/Makefile b/Makefile
@@ -118,7 +118,7 @@ clean:
 	cd env/posix && rm -rf querycsv; find . -maxdepth 1 -type f \( -iname \*.c -o -iname \*.h -o -iname \*.o \) -exec rm -rf {} \;
 	rm -rf querycsv; find . -maxdepth 1 -type f \( -iname \*.o \) -exec rm -rf {} \;
 	cd env/dos && find . -maxdepth 1 ! -path './dos.c' ! -path './Makefile' ! -path '..' ! -path '.' -exec rm -rf {} \;
-	cd env/win32 && find . -maxdepth 1 ! -path './win32.c' ! -path './Makefile' ! -path '..' ! -path '.' -exec rm -rf {} \;
+	cd env/win32 && find . -maxdepth 1 ! -path './win32.c' ! -path './qcsv16.ico' ! -path './qcsv32.ico' ! -path './querycsv.rc' ! -path './resource.h' ! -path './Makefile' ! -path '..' ! -path '.' -exec rm -rf {} \;
 	cd env/m68kmac && find . -type f ! -path './.finf/TEGlue.a' ! -path './TEGlue.s' ! -path './TEGlue.a' ! -path './.finf/QueryCSV.make' ! -path './QueryCSV.make' ! -path './CMakeLists.txt' ! -path './mac.h' ! -path './mac.c' ! -path './mac.r' ! -path './size.r' ! -path './blank.zip' -exec rm {} \; && find . -maxdepth 1 -type d ! -path '..' ! -path '.' ! -path './.finf' -exec rm -rf {} \; && mac2unix *
 	cd env/powermac && find . -type f ! -path './.finf/Makefile' ! -path './Makefile' ! -path './powermac.h' ! -path './powermac.c' ! -path './mac.c' ! -path './powermac.r' ! -path './size.r' ! -path './carbon.r' ! -path './blank.zip' -exec rm {} \; && find . -maxdepth 1 -type d ! -path '..' ! -path '.' ! -path './.finf' -exec rm -rf {} \; && mac2unix *
 	rm -rf env/bbcarm/c env/bbcarm/h env/bbcarm/o hash2

diff --git a/env/win32/Makefile b/env/win32/Makefile
@@ -2,4 +2,5 @@
 OBJECTS = *.c
 querycsv.exe: $(OBJECTS)
 	wcl386 -bcl=nt /dMICROSOFT=1 /dWINDOWS=1 /fe=querycsv /os $(OBJECTS)
+	wrc -bt=nt querycsv.rc querycsv.exe
 	c:\upx\upx .\querycsv.exe
diff --git a/env/win32/qcsv16.ico b/env/win32/qcsv16.ico
diff --git a/env/win32/qcsv32.ico b/env/win32/qcsv32.ico
diff --git a/env/win32/querycsv.rc b/env/win32/querycsv.rc
@@ -0,0 +1,14 @@
+#include <windows.h>
+#include <commctrl.h>
+#include <richedit.h>
+#include "resource.h"
+
+//
+// Icon resources
+//
+LANGUAGE 0, SUBLANG_NEUTRAL
+IDI_ICON1          ICON           "qcsv32.ico"
+
+
+LANGUAGE 0, SUBLANG_NEUTRAL
+IDI_ICON2          ICON           "qcsv16.ico"
diff --git a/env/win32/resource.h b/env/win32/resource.h
@@ -0,0 +1,6 @@
+#ifndef IDC_STATIC
+#define IDC_STATIC (-1)
+#endif
+
+#define IDI_ICON1                               100
+#define IDI_ICON2                               101