From 692487755de8d0201003b98873344930ab00fc9a Mon Sep 17 00:00:00 2001
From: Alison Watson <marrub.xz@gmail.com>
Date: Thu, 12 Dec 2019 23:01:12 -0500
Subject: [PATCH] add spingle.rc/ico

---
 CMakeLists.txt             |   2 +-
 source/q_stdinc.h          |   1 -
 source/windows/resource.h  |  23 -----------------------
 source/windows/spingle.ico | Bin 0 -> 10366 bytes
 source/windows/spingle.rc  |   4 ++++
 5 files changed, 5 insertions(+), 25 deletions(-)
 delete mode 100644 source/windows/resource.h
 create mode 100644 source/windows/spingle.ico
 create mode 100644 source/windows/spingle.rc

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6a4f4f3..f3f9d3f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -177,7 +177,7 @@ set(srcs_windows
 	source/windows/net_wipx.c
 	source/windows/net_wipx.h
 	source/windows/pl_win.c
-	source/windows/resource.h
+	source/windows/spingle.rc
 	source/windows/sys_sdl_win.c
 	source/windows/wsaerror.h)
 
diff --git a/source/q_stdinc.h b/source/q_stdinc.h
index d23c1a2..308c0fa 100644
--- a/source/q_stdinc.h
+++ b/source/q_stdinc.h
@@ -47,7 +47,6 @@
 #endif
 
 _Static_assert(sizeof(float) == 4, "float not correct size");
-_Static_assert(sizeof(int32_t)   == 4, "int32_t not correct size");
 
 /* make sure enums are the size of ints for structure packing */
 enum dummy_enum
diff --git a/source/windows/resource.h b/source/windows/resource.h
deleted file mode 100644
index 007c102..0000000
--- a/source/windows/resource.h
+++ /dev/null
@@ -1,23 +0,0 @@
-#ifndef spingle__resource_h
-#define spingle__resource_h
-
-//{{NO_DEPENDENCIES}}
-// Microsoft Developer Studio generated include file.
-// Used by the .rc file
-#define IDS_STRING1                     1
-#define IDI_ICON2                       1
-#define IDD_DIALOG1                     108
-#define IDD_PROGRESS                    109
-#define IDC_PROGRESS                    1000
-
-// Next default values for new objects
-#if defined(APSTUDIO_INVOKED)
-#if !defined(APSTUDIO_READONLY_SYMBOLS)
-#define _APS_NEXT_RESOURCE_VALUE        113
-#define _APS_NEXT_COMMAND_VALUE         40001
-#define _APS_NEXT_CONTROL_VALUE         1004
-#define _APS_NEXT_SYMED_VALUE           101
-#endif
-#endif
-
-#endif
diff --git a/source/windows/spingle.ico b/source/windows/spingle.ico
new file mode 100644
index 0000000000000000000000000000000000000000..05fde034139a1ad6ad9bfbc763d2be61daf5d10d
GIT binary patch
literal 10366
zcmeHL&ubJ(6n@PZBeFt+7{pC-2z&6@9t2NwF?b#kyg3B+B1;IluY?9KyDa3W1b;9=
z64*uOsK{Ot#4H{hW*BfoHZw59WQNfF{(_DAeXqJl51yt41?z=WbyvNw-m9;^SCffI
zfS))H(H@hV=S3z&1f9hA#h{Jz@v~MEIXC$urrycrE3<MW@8#E}Tk_i<zssGKyR!c0
zx?o72K7S_f&~LrklI{Pt<^T6bw%kl1`)Rfie5N>l<)Id^x3eB!fIjv7dHs0(jLv|s
zA74MCt4IC)>p#E!-#-Nk$lt&I{w*M%Z{q&_=UQ;Rflb8IZYMQ-VeD#L=38It?9#Oh
zr*C#u2lkb3S!4DmFaiDF=X0r{+B`*9)qf+I=<0^8){`X;#pZ)`*h^KL?8Y!b{KS*a
zx|~yOoun&l5TI%Oz{gc#8vAng_3m2G&@}wz@n4S{+B)8WVFvgI^lKyIz2kg>B_UGX
zV|rQ%nMQ340~#)?MhkerWbT^RZz9WjP_j8RVI47<UK*}W@|}xlR8^fT^Xa2&j@PiN
zhsePhqYSv(pwvbhi6dbV*xHnN3|&9Pr`Vt~MoGBZ-uON;?Tal;Y|~iLp=*v$Wx;LG
z7O*H`Lv?eCX&ku3n&7u*tbBCM@ok=SbfaT|T$E@@b+Me_EDm@cz>Xs!vI5I^%=Mc@
z9AAWRE^!5mGFK&$3DW2@e%finr=M|5E@&=(T9F%gsZkZ<@HOsh(_j>lmY_O}?O|~p
za$K9l`D4`KH{~oBgJjZ2P?w9+oU(N)Rq$WOCa`uF2il;gwipU}HT*zKAKIfT=6GOC
z7;>Zr<1#=C#F%A|J>tQq;afr7<}B@fWNA@wa=<Fm(8{y}qeVJ2b473XI6D;6{h>4*
zz5Oxn-Eyeql`$;RoJYgYIZ<JsUBu>Q86^qqol<XStRvutD^lBG9)B^zr__DQGT~K_
z25)$%2WSqdE@xShnkz;u{xChNB4PfUj1sMKUpzytKswIy%H!5xhHsacH{L2`Fq3hQ
zw+LBaKbYJ%eJG!@t<V)__ypI(PNfb3O?Gx89-_%KrWB|_G?ie!v-2}BdF9on>;^Hs
zzTj!Xc_ZuJL~;=~7<U5b0-D2!Q`l9K6{)$7x%jFtub#ODubu>_=g~u}DEXdC)k!_M
z9bKI7Vvh8}OhBa^Z$qOrF8@)G4&(9u@0Zcllht2=1-$;e{tC#)-=F^f7Z1IDMrXj^
qzyAImT|NHu{|nU5y}t|D%2&qodyzNKfM>un;2H1?cm}>N20j3!Z8o6*

literal 0
HcmV?d00001

diff --git a/source/windows/spingle.rc b/source/windows/spingle.rc
new file mode 100644
index 0000000..e606844
--- /dev/null
+++ b/source/windows/spingle.rc
@@ -0,0 +1,4 @@
+#include <winresrc.h>
+
+icon ICON "spingle.ico"
+