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 0000000..05fde03 Binary files /dev/null and b/source/windows/spingle.ico differ 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 + +icon ICON "spingle.ico" +