m/grafX2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

screen.h: remove #include <windows.h>

Browse Source
This commit is contained in:
Thomas Bernard 2020-01-04 17:22:58 +01:00
parent 811cb619b6
commit 3551f6bbc6
No known key found for this signature in database
GPG Key ID: 0FF11B67A5C0863C
6 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/factory.c
View File

@ -61,6 +61,9 @@ char * Bound_script[10];
#include <limits.h> //for INT_MIN #include <limits.h> //for INT_MIN
#include <string.h> // strncpy() #include <string.h> // strncpy()
#include <stdlib.h> // for atof() #include <stdlib.h> // for atof()
#if defined(WIN32)
#include <windows.h>
#endif
#if defined(_MSC_VER) #if defined(_MSC_VER)
#define strdup _strdup #define strdup _strdup
#define putenv _putenv #define putenv _putenv

2
src/filesel.c
View File

@ -31,7 +31,7 @@
#elif defined (__MINT__) #elif defined (__MINT__)
#include <mint/sysbind.h> #include <mint/sysbind.h>
#elif defined(WIN32) #elif defined(WIN32)
//#include <windows.h> // Native_filesel() is currently disabled #include <windows.h> // Native_filesel() is currently disabled
//#include <commdlg.h> //#include <commdlg.h>
#endif #endif

4
src/init.c
View File

@ -50,8 +50,8 @@
#if defined(USE_SDL) #if defined(USE_SDL)
#include <SDL_byteorder.h> #include <SDL_byteorder.h>
#endif #endif
#if defined(WIN32) #if defined(WIN32) && !defined(USE_SDL) && !defined(USE_SDL2)
#include <windows.h> // GetLogicalDrives(), GetDriveType(), DRIVE_* #include <windows.h>
#endif #endif
#if defined (__MINT__) #if defined (__MINT__)
#include <mint/osbind.h> #include <mint/osbind.h>

8
src/screen.h
View File

@ -29,9 +29,6 @@
#ifndef SCREEN_H_INCLUDED #ifndef SCREEN_H_INCLUDED
#define SCREEN_H_INCLUDED #define SCREEN_H_INCLUDED
#ifdef WIN32
#include <windows.h> // for HWND
#endif
#if defined(USE_SDL) || defined(USE_SDL2) #if defined(USE_SDL) || defined(USE_SDL2)
#include <SDL.h> #include <SDL.h>
#if defined(SDL_VIDEO_DRIVER_X11) #if defined(SDL_VIDEO_DRIVER_X11)
@ -76,7 +73,10 @@ void GFX2_UpdateScreen(void);
#endif #endif
#if defined(WIN32) #if defined(WIN32)
HWND GFX2_Get_Window_Handle(void); /**
* @return a HWND (casted to void *)
*/
void * GFX2_Get_Window_Handle(void);
#endif #endif
#if defined(USE_X11) || defined(SDL_VIDEO_DRIVER_X11) #if defined(USE_X11) || defined(SDL_VIDEO_DRIVER_X11)

2
src/sdlscreen.c
View File

@ -534,7 +534,7 @@ void Clear_border(byte color)
} }
#ifdef WIN32 #ifdef WIN32
HWND GFX2_Get_Window_Handle(void) void * GFX2_Get_Window_Handle(void)
{ {
SDL_SysWMinfo wminfo; SDL_SysWMinfo wminfo;

2
src/win32screen.c
View File

@ -49,7 +49,7 @@ static int Windows_DIB_height = 0;
static HWND Win32_hwnd = NULL; static HWND Win32_hwnd = NULL;
static int Win32_Is_Fullscreen = 0; static int Win32_Is_Fullscreen = 0;
HWND GFX2_Get_Window_Handle() void * GFX2_Get_Window_Handle()
{ {
return Win32_hwnd; return Win32_hwnd;
} }