pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed compiling with mingw32/64

Browse source
This commit is contained in:
Sam Lantinga 2010-09-19 16:46:56 -07:00
parent 12be16146b
commit 44eb5de93d
3 changed files with 38 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

4
configure.in
View file

@ -2566,7 +2566,7 @@ AC_HELP_STRING([--enable-render-d3d], [enable the Direct3D render driver [[defau
if test x$have_dinput = xyes; then if test x$have_dinput = xyes; then
AC_DEFINE(SDL_JOYSTICK_DINPUT) AC_DEFINE(SDL_JOYSTICK_DINPUT)
SOURCES="$SOURCES $srcdir/src/joystick/win32/SDL_dxjoystick.c" SOURCES="$SOURCES $srcdir/src/joystick/win32/SDL_dxjoystick.c"
EXTRA_LDFLAGS="$EXTRA_LDFLAGS -ldinput8 -ldxguid -ldxerr8 -lole32" EXTRA_LDFLAGS="$EXTRA_LDFLAGS -ldinput8 -ldxguid -ldxerr8"
else else
AC_DEFINE(SDL_JOYSTICK_WINMM) AC_DEFINE(SDL_JOYSTICK_WINMM)
SOURCES="$SOURCES $srcdir/src/joystick/win32/SDL_mmjoystick.c" SOURCES="$SOURCES $srcdir/src/joystick/win32/SDL_mmjoystick.c"
@ -2610,7 +2610,7 @@ AC_HELP_STRING([--enable-render-d3d], [enable the Direct3D render driver [[defau
# SDL 1.3 is unicode, and unicows emulates this on Windows 98/ME # SDL 1.3 is unicode, and unicows emulates this on Windows 98/ME
# You can get this here: http://libunicows.sourceforge.net/ # You can get this here: http://libunicows.sourceforge.net/
#EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lunicows" #EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lunicows"
EXTRA_LDFLAGS="$EXTRA_LDFLAGS -luser32 -lgdi32 -lmsimg32 -lwinmm" EXTRA_LDFLAGS="$EXTRA_LDFLAGS -luser32 -lgdi32 -lmsimg32 -lwinmm -limm32 -lole32 -loleaut32 -lversion -luuid"
# The Win32 platform requires special setup # The Win32 platform requires special setup
VERSION_SOURCES="$srcdir/src/main/win32/*.rc" VERSION_SOURCES="$srcdir/src/main/win32/*.rc"
SDLMAIN_SOURCES="$srcdir/src/main/win32/*.c" SDLMAIN_SOURCES="$srcdir/src/main/win32/*.c"

83
src/video/win32/SDL_msctf.h
View file

@ -1,43 +1,30 @@
#ifndef _SDL_msctf_h #ifndef _SDL_msctf_h
#define _SDL_msctf_h #define _SDL_msctf_h
#define CONST_VTBL
#include <basetyps.h>
#include <unknwn.h> #include <unknwn.h>
EXTERN_C const IID IID_ITfInputProcessorProfileActivationSink;
EXTERN_C const IID IID_ITfUIElementSink;
EXTERN_C const IID IID_ITfSource;
EXTERN_C const IID IID_ITfUIElementMgr;
EXTERN_C const IID IID_ITfReadingInformationUIElement;
EXTERN_C const IID IID_ITfThreadMgr;
EXTERN_C const IID IID_ITfThreadMgrEx;
EXTERN_C const CLSID CLSID_TF_ThreadMgr;
EXTERN_C const GUID GUID_TFCAT_TIP_KEYBOARD;
#define TF_INVALID_COOKIE (0xffffffff) #define TF_INVALID_COOKIE (0xffffffff)
#define TF_IPSINK_FLAG_ACTIVE 0x0001 #define TF_IPSINK_FLAG_ACTIVE 0x0001
#define TF_TMAE_UIELEMENTENABLEDONLY 0x00000004 #define TF_TMAE_UIELEMENTENABLEDONLY 0x00000004
typedef _COM_interface ITfThreadMgr ITfThreadMgr; typedef struct ITfThreadMgr ITfThreadMgr;
typedef _COM_interface ITfDocumentMgr ITfDocumentMgr; typedef struct ITfDocumentMgr ITfDocumentMgr;
typedef _COM_interface ITfClientId ITfClientId; typedef struct ITfClientId ITfClientId;
typedef _COM_interface IEnumTfDocumentMgrs IEnumTfDocumentMgrs; typedef struct IEnumTfDocumentMgrs IEnumTfDocumentMgrs;
typedef _COM_interface IEnumTfFunctionProviders IEnumTfFunctionProviders; typedef struct IEnumTfFunctionProviders IEnumTfFunctionProviders;
typedef _COM_interface ITfFunctionProvider ITfFunctionProvider; typedef struct ITfFunctionProvider ITfFunctionProvider;
typedef _COM_interface ITfCompartmentMgr ITfCompartmentMgr; typedef struct ITfCompartmentMgr ITfCompartmentMgr;
typedef _COM_interface ITfContext ITfContext; typedef struct ITfContext ITfContext;
typedef _COM_interface IEnumTfContexts IEnumTfContexts; typedef struct IEnumTfContexts IEnumTfContexts;
typedef _COM_interface ITfUIElementSink ITfUIElementSink; typedef struct ITfUIElementSink ITfUIElementSink;
typedef _COM_interface ITfUIElement ITfUIElement; typedef struct ITfUIElement ITfUIElement;
typedef _COM_interface ITfUIElementMgr ITfUIElementMgr; typedef struct ITfUIElementMgr ITfUIElementMgr;
typedef _COM_interface IEnumTfUIElements IEnumTfUIElements; typedef struct IEnumTfUIElements IEnumTfUIElements;
typedef _COM_interface ITfThreadMgrEx ITfThreadMgrEx; typedef struct ITfThreadMgrEx ITfThreadMgrEx;
typedef _COM_interface ITfReadingInformationUIElement ITfReadingInformationUIElement; typedef struct ITfReadingInformationUIElement ITfReadingInformationUIElement;
typedef _COM_interface ITfInputProcessorProfileActivationSink ITfInputProcessorProfileActivationSink; typedef struct ITfInputProcessorProfileActivationSink ITfInputProcessorProfileActivationSink;
typedef _COM_interface ITfSource ITfSource; typedef struct ITfSource ITfSource;
typedef DWORD TfClientId; typedef DWORD TfClientId;
typedef DWORD TfEditCookie; typedef DWORD TfEditCookie;
@ -60,9 +47,9 @@ typedef struct ITfThreadMgrVtbl
HRESULT (STDMETHODCALLTYPE *GetGlobalCompartment)(ITfThreadMgr *, ITfCompartmentMgr **); HRESULT (STDMETHODCALLTYPE *GetGlobalCompartment)(ITfThreadMgr *, ITfCompartmentMgr **);
} ITfThreadMgrVtbl; } ITfThreadMgrVtbl;
_COM_interface ITfThreadMgr struct ITfThreadMgr
{ {
CONST_VTBL struct ITfThreadMgrVtbl *lpVtbl; const struct ITfThreadMgrVtbl *lpVtbl;
}; };
typedef struct ITfThreadMgrExVtbl typedef struct ITfThreadMgrExVtbl
@ -85,9 +72,9 @@ typedef struct ITfThreadMgrExVtbl
HRESULT (STDMETHODCALLTYPE *GetActiveFlags)(ITfThreadMgrEx *, DWORD *); HRESULT (STDMETHODCALLTYPE *GetActiveFlags)(ITfThreadMgrEx *, DWORD *);
} ITfThreadMgrExVtbl; } ITfThreadMgrExVtbl;
_COM_interface ITfThreadMgrEx struct ITfThreadMgrEx
{ {
CONST_VTBL struct ITfThreadMgrExVtbl *lpVtbl; const struct ITfThreadMgrExVtbl *lpVtbl;
}; };
typedef struct ITfDocumentMgrVtbl typedef struct ITfDocumentMgrVtbl
@ -103,9 +90,9 @@ typedef struct ITfDocumentMgrVtbl
HRESULT (STDMETHODCALLTYPE *EnumContexts)(ITfDocumentMgr *, IEnumTfContexts **); HRESULT (STDMETHODCALLTYPE *EnumContexts)(ITfDocumentMgr *, IEnumTfContexts **);
} ITfDocumentMgrVtbl; } ITfDocumentMgrVtbl;
_COM_interface ITfDocumentMgr struct ITfDocumentMgr
{ {
CONST_VTBL struct ITfDocumentMgrVtbl *lpVtbl; const struct ITfDocumentMgrVtbl *lpVtbl;
}; };
typedef struct ITfUIElementSinkVtbl typedef struct ITfUIElementSinkVtbl
@ -118,9 +105,9 @@ typedef struct ITfUIElementSinkVtbl
HRESULT (STDMETHODCALLTYPE *EndUIElement)(ITfUIElementSink *, DWORD); HRESULT (STDMETHODCALLTYPE *EndUIElement)(ITfUIElementSink *, DWORD);
} ITfUIElementSinkVtbl; } ITfUIElementSinkVtbl;
_COM_interface ITfUIElementSink struct ITfUIElementSink
{ {
CONST_VTBL struct ITfUIElementSinkVtbl *lpVtbl; const struct ITfUIElementSinkVtbl *lpVtbl;
}; };
typedef struct ITfUIElementMgrVtbl typedef struct ITfUIElementMgrVtbl
@ -135,9 +122,9 @@ typedef struct ITfUIElementMgrVtbl
HRESULT (STDMETHODCALLTYPE *EnumUIElements)(ITfUIElementMgr *, IEnumTfUIElements **); HRESULT (STDMETHODCALLTYPE *EnumUIElements)(ITfUIElementMgr *, IEnumTfUIElements **);
} ITfUIElementMgrVtbl; } ITfUIElementMgrVtbl;
_COM_interface ITfUIElementMgr struct ITfUIElementMgr
{ {
CONST_VTBL struct ITfUIElementMgrVtbl *lpVtbl; const struct ITfUIElementMgrVtbl *lpVtbl;
}; };
typedef struct ITfReadingInformationUIElementVtbl typedef struct ITfReadingInformationUIElementVtbl
@ -157,9 +144,9 @@ typedef struct ITfReadingInformationUIElementVtbl
HRESULT (STDMETHODCALLTYPE *IsVerticalOrderPreferred)(ITfReadingInformationUIElement *, BOOL *); HRESULT (STDMETHODCALLTYPE *IsVerticalOrderPreferred)(ITfReadingInformationUIElement *, BOOL *);
} ITfReadingInformationUIElementVtbl; } ITfReadingInformationUIElementVtbl;
_COM_interface ITfReadingInformationUIElement struct ITfReadingInformationUIElement
{ {
CONST_VTBL struct ITfReadingInformationUIElementVtbl *lpVtbl; const struct ITfReadingInformationUIElementVtbl *lpVtbl;
}; };
typedef struct ITfUIElementVtbl typedef struct ITfUIElementVtbl
@ -173,9 +160,9 @@ typedef struct ITfUIElementVtbl
HRESULT (STDMETHODCALLTYPE *IsShown)(ITfUIElement *, BOOL *); HRESULT (STDMETHODCALLTYPE *IsShown)(ITfUIElement *, BOOL *);
} ITfUIElementVtbl; } ITfUIElementVtbl;
_COM_interface ITfUIElement struct ITfUIElement
{ {
CONST_VTBL struct ITfUIElementVtbl *lpVtbl; const struct ITfUIElementVtbl *lpVtbl;
}; };
typedef struct ITfInputProcessorProfileActivationSinkVtbl typedef struct ITfInputProcessorProfileActivationSinkVtbl
@ -187,9 +174,9 @@ typedef struct ITfInputProcessorProfileActivationSinkVtbl
} ITfInputProcessorProfileActivationSinkVtbl; } ITfInputProcessorProfileActivationSinkVtbl;
_COM_interface ITfInputProcessorProfileActivationSink struct ITfInputProcessorProfileActivationSink
{ {
CONST_VTBL struct ITfInputProcessorProfileActivationSinkVtbl *lpVtbl; const struct ITfInputProcessorProfileActivationSinkVtbl *lpVtbl;
}; };
typedef struct ITfSourceVtbl typedef struct ITfSourceVtbl
@ -201,9 +188,9 @@ typedef struct ITfSourceVtbl
HRESULT (STDMETHODCALLTYPE *UnadviseSink)(ITfSource *, DWORD); HRESULT (STDMETHODCALLTYPE *UnadviseSink)(ITfSource *, DWORD);
} ITfSourceVtbl; } ITfSourceVtbl;
_COM_interface ITfSource struct ITfSource
{ {
CONST_VTBL struct ITfSourceVtbl *lpVtbl; const struct ITfSourceVtbl *lpVtbl;
}; };
#endif /* _SDL_msctf_h */ #endif /* _SDL_msctf_h */

2
src/video/win32/SDL_win32keyboard.c
View file

@ -190,7 +190,7 @@ WIN_SetTextInputRect(_THIS, SDL_Rect *rect)
#ifdef __GNUC__ #ifdef __GNUC__
#undef DEFINE_GUID #undef DEFINE_GUID
#define DEFINE_GUID(n,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8) const GUID n GUID_SECT = {l,w1,w2,{b1,b2,b3,b4,b5,b6,b7,b8}} #define DEFINE_GUID(n,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8) static const GUID n = {l,w1,w2,{b1,b2,b3,b4,b5,b6,b7,b8}}
DEFINE_GUID(IID_ITfInputProcessorProfileActivationSink, 0x71C6E74E,0x0F28,0x11D8,0xA8,0x2A,0x00,0x06,0x5B,0x84,0x43,0x5C); DEFINE_GUID(IID_ITfInputProcessorProfileActivationSink, 0x71C6E74E,0x0F28,0x11D8,0xA8,0x2A,0x00,0x06,0x5B,0x84,0x43,0x5C);
DEFINE_GUID(IID_ITfUIElementSink, 0xEA1EA136,0x19DF,0x11D7,0xA6,0xD2,0x00,0x06,0x5B,0x84,0x43,0x5C); DEFINE_GUID(IID_ITfUIElementSink, 0xEA1EA136,0x19DF,0x11D7,0xA6,0xD2,0x00,0x06,0x5B,0x84,0x43,0x5C);
DEFINE_GUID(GUID_TFCAT_TIP_KEYBOARD, 0x34745C63,0xB2F0,0x4784,0x8B,0x67,0x5E,0x12,0xC8,0x70,0x1A,0x31); DEFINE_GUID(GUID_TFCAT_TIP_KEYBOARD, 0x34745C63,0xB2F0,0x4784,0x8B,0x67,0x5E,0x12,0xC8,0x70,0x1A,0x31);