shithub: duke3d

Info  •  Files  •  Log  •  Branches

Use high-res icon on Windows.

--- a/Engine/src/cache.c

+++ b/Engine/src/cache.c

@@ -7,22 +7,11 @@

 #include <stdio.h>

 #include <stdlib.h>

-#include <string.h>

-#include <fcntl.h>

-#include <sys/types.h>

-#include <sys/stat.h>

-

-#include "platform.h"

+#include "cache.h"

 #include "display.h"

-

 #include "fixedPoint_math.h"

-#include "cache.h"

 #include "build.h"

-

-#include "../../Game/src/cvar_defs.h"

-

-#include "../../Game/src/types.h"

 /*

  *   This module keeps track of a standard linear cacheing system.

--- a/Engine/src/cache.h

+++ b/Engine/src/cache.h

@@ -17,6 +17,8 @@

 #ifndef _INCLUDE_CACHE1D_H_

 #define _INCLUDE_CACHE1D_H_

+#include <stdint.h>

+

 void initcache(uint8_t* dacachestart, int32_t dacachesize);

 void allocache (uint8_t* *newhandle, int32_t newbytes, uint8_t  *newlockptr);

 void suckcache (int32_t *suckptr);

--- a/Engine/src/display.c

+++ b/Engine/src/display.c

@@ -201,8 +201,8 @@

     SDL_CHECK_NOT_NULL(window, "create window");

-    // don't override higher-res app icon on OS X

-#ifndef PLATFORM_MACOSX

+    // don't override higher-res app icon on OS X or Windows

+#if !PLATFORM_MACOSX && !WIN32

     SDL_Surface* image = SDL_LoadBMP_RW(SDL_RWFromMem(iconBMP, sizeof(iconBMP)), 1);

     Uint32 colorkey = 0; // index in this image to be transparent

     SDL_SetColorKey(image, SDL_TRUE, colorkey);