diff --git a/misc/compile-fixes.md b/doc/compile-fixes.md similarity index 100% rename from misc/compile-fixes.md rename to doc/compile-fixes.md diff --git a/misc/hosting-flask.md b/doc/hosting-flask.md similarity index 100% rename from misc/hosting-flask.md rename to doc/hosting-flask.md diff --git a/misc/hosting-webclient.md b/doc/hosting-webclient.md similarity index 100% rename from misc/hosting-webclient.md rename to doc/hosting-webclient.md diff --git a/misc/plugin-dev.md b/doc/plugin-dev.md similarity index 100% rename from misc/plugin-dev.md rename to doc/plugin-dev.md diff --git a/misc/portability.md b/doc/portability.md similarity index 100% rename from misc/portability.md rename to doc/portability.md diff --git a/misc/style.md b/doc/style.md similarity index 100% rename from misc/style.md rename to doc/style.md diff --git a/readme.md b/readme.md index 6a79af63d..670a07043 100644 --- a/readme.md +++ b/readme.md @@ -16,7 +16,7 @@ It **does not** work with 'modern/premium' Minecraft servers. #### Requirements * Windows: 2000 or later. (Windows 98 with KernelEx also *technically* works) -* OSX: OSX 10.5 or later. (Can be compiled to work with 10.4 though) +* macOS: macOS 10.5 or later. (Can be compiled to work with 10.4 though) * Linux: libcurl and libopenal. #### Instructions diff --git a/src/Window.c b/src/Window.c index a1c2df30d..ed83a8ae8 100644 --- a/src/Window.c +++ b/src/Window.c @@ -1136,6 +1136,18 @@ void Window_Init(void) { DisplayInfo.DpiY = 1; } +#ifdef CC_BUILD_X11ICON +static void ApplyIcon(void) { + Atom net_wm_icon = XInternAtom(win_display, "_NET_WM_ICON", false); + Atom xa_cardinal = XInternAtom(win_display, "CARDINAL", false); + extern const long CCIcon_Data[]; + extern const int CCIcon_Size; + XChangeProperty(win_display, win_handle, net_wm_icon, xa_cardinal, 32, PropModeReplace, CCIcon_Data, CCIcon_Size); +} +#else +static void ApplyIcon(void) { } +#endif + void Window_Create(int width, int height) { XSetWindowAttributes attributes = { 0 }; XSizeHints hints = { 0 }; @@ -1192,14 +1204,7 @@ void Window_Create(int width, int height) { hint.res_name = GAME_APP_TITLE; hint.res_class = GAME_APP_TITLE; XSetClassHint(win_display, win_handle, &hint); - -#ifdef CC_BUILD_X11ICON - Atom net_wm_icon = XInternAtom(win_display, "_NET_WM_ICON", false); - Atom xa_cardinal = XInternAtom(win_display, "CARDINAL", false); - extern const long CCIcon_Data[]; - extern const int CCIcon_Size; - XChangeProperty(win_display, win_handle, net_wm_icon, xa_cardinal, 32, PropModeReplace, CCIcon_Data, CCIcon_Size); -#endif + ApplyIcon(); } void Window_SetTitle(const String* title) {