ShuriZma
/
project64
mirror of https://github.com/project64/project64.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Glide64] Clean up project so it is building correctly in Visual Studio 2008

This commit is contained in:
zilmar 2015-10-19 13:54:16 +11:00
parent 5582d83eec
commit 8ba4024ce7
15 changed files with 3806 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Source/3rd Party/sdl/sdl2.vcproj
View File

@ -93,7 +93,9 @@
/>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="include;&quot;$(Root)Source/3rd Party/directx/include&quot;"
UsePrecompiledHeader="0"
WarningLevel="3"
DisableSpecificWarnings="4127"
/>
<Tool
@ -107,6 +109,7 @@
/>
<Tool
Name="VCLibrarianTool"
AdditionalDependencies="version.lib imm32.lib winmm.lib"
/>
<Tool
Name="VCALinkTool"

4
Source/3rd Party/wx/include/msvc/wx/setup.h
View File

@ -190,8 +190,6 @@
#endif // wxUSE_GUI
#else // release
#pragma comment(lib,"wxbase28")
#pragma comment(lib,"wxbase28_net")
#pragma comment(lib,"wxbase28_xml")
#if wxUSE_REGEX
#pragma comment(lib,"wxregex")
#endif
@ -212,9 +210,7 @@
#if wxUSE_ZLIB
#pragma comment(lib,"wxzlib")
#endif
#pragma comment(lib,"wxmsw28_adv")
#pragma comment(lib,"wxmsw28_core")
#pragma comment(lib,"wxmsw28_html")
#if wxUSE_GLCANVAS
#pragma comment(lib,"wxmsw28_gl")
#endif

44
Source/3rd Party/wx/lib/vc_lib/msw/wx/msw/rcdefs.h Normal file
View File

@ -0,0 +1,44 @@
#ifndef _WX_RCDEFS_H
#define _WX_RCDEFS_H
#define WX_MSC_FULL_VER 150021022
#define WX_CPU_X86
#endif

1361
Source/3rd Party/wx/lib/vc_lib/msw/wx/setup.h Normal file
View File

File diff suppressed because it is too large Load Diff

24
Source/3rd Party/wx/lib/vc_lib/mswu/wx/setup.h
View File

@ -139,7 +139,7 @@
//
// Recommended setting: 1, it is compiled into a separate library so there
// is no overhead if you don't use it
#define wxUSE_DEBUGREPORT 1
#define wxUSE_DEBUGREPORT 0
// ----------------------------------------------------------------------------
// Unicode support
@ -520,7 +520,7 @@
//
// Recommended setting: 1 if your compiler supports it, if it doesn't please
// contribute us a makefile for src/regex for it
#define wxUSE_REGEX 1
#define wxUSE_REGEX 0
// wxSystemOptions class
#define wxUSE_SYSTEM_OPTIONS 1
@ -533,7 +533,7 @@
// Default is 1.
//
// Recommended setting: 1
#define wxUSE_MEDIACTRL 1
#define wxUSE_MEDIACTRL 0
// Use GStreamer for Unix (req a lot of dependancies)
//
@ -547,7 +547,7 @@
// Default is 1
//
// Recommended setting: 1 (requires wxUSE_XML)
#define wxUSE_XRC 1
#define wxUSE_XRC 0
// XML parsing classes. Note that their API will change in the future, so
// using wxXmlDocument and wxXmlNode in your app is not recommended.
@ -562,7 +562,7 @@
// Default is 1
//
// Recommended setting: 1
#define wxUSE_AUI 1
#define wxUSE_AUI 0
// Enable the new wxGraphicsPath and wxGraphicsContext classes for an advanced
@ -1011,7 +1011,7 @@
//
// Recommended setting: 1, set to 0 if you want compile a
// smaller library.
#define wxUSE_RICHTEXT 1
#define wxUSE_RICHTEXT 0
// ----------------------------------------------------------------------------
// Data transfer
@ -1170,25 +1170,25 @@
#define wxUSE_LIBJPEG 1
// Set to 1 for TIFF format support (requires libtiff)
#define wxUSE_LIBTIFF 1
#define wxUSE_LIBTIFF 0
// Set to 1 for TGA format support (loading only)
#define wxUSE_TGA 1
#define wxUSE_TGA 0
// Set to 1 for GIF format support
#define wxUSE_GIF 1
#define wxUSE_GIF 0
// Set to 1 for PNM format support
#define wxUSE_PNM 1
#define wxUSE_PNM 0
// Set to 1 for PCX format support
#define wxUSE_PCX 1
#define wxUSE_PCX 0
// Set to 1 for IFF format support (Amiga format)
#define wxUSE_IFF 0
// Set to 1 for XPM format support
#define wxUSE_XPM 1
#define wxUSE_XPM 0
// Set to 1 for MS Icons and Cursors format support
#define wxUSE_ICO_CUR 1

8
Source/3rd Party/wx/src/common/image.cpp
View File

@ -167,7 +167,13 @@ wxImage::wxImage(const char* const* xpmData)
Create(xpmData);
}
bool wxImage::Create(const char* const* xpmData)
bool wxImage::Create(const char* const*
#ifdef wxUSE_XPM
xpmData
#else
/*xpmData*/
#endif
)
{
#if wxUSE_XPM
UnRef();

487
Source/3rd Party/wx/src/msw/gsockmsw.cpp Normal file
View File

@ -0,0 +1,487 @@
/* -------------------------------------------------------------------------
* Project: GSocket (Generic Socket)
* Name: src/msw/gsockmsw.cpp
* Copyright: (c) Guilhem Lavaux
* Licence: wxWindows Licence
* Author: Guillermo Rodriguez Garcia <guille@iies.es>
* Purpose: GSocket GUI-specific MSW code
* CVSID: $Id: gsockmsw.cpp 50893 2007-12-22 14:05:25Z VZ $
* -------------------------------------------------------------------------
*/
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#ifdef __BORLANDC__
#pragma hdrstop
#endif
/*
* DONE: for WinCE we need to replace WSAAsyncSelect
* (Windows message-based notification of network events for a socket)
* with another mechanism.
* As WSAAsyncSelect is not present on WinCE, it now uses
* WSACreateEvent, WSAEventSelect, WSAWaitForMultipleEvents and WSAEnumNetworkEvents.
* When enabling eventhandling for a socket a new thread it created that keeps track of the events
* and posts a messageto the hidden window to use the standard message loop.
*/
/* including rasasync.h (included from windows.h itself included from
* wx/setup.h and/or winsock.h results in this warning for
* RPCNOTIFICATION_ROUTINE
*/
#ifdef _MSC_VER
# pragma warning(disable:4115) /* named type definition in parentheses */
#endif
/* This needs to be before the wx/defs/h inclusion
* for some reason
*/
#ifdef __WXWINCE__
/* windows.h results in tons of warnings at max warning level */
# ifdef _MSC_VER
# pragma warning(push, 1)
# endif
# include <windows.h>
# ifdef _MSC_VER
# pragma warning(pop)
# pragma warning(disable:4514)
# endif
#endif
#ifndef __GSOCKET_STANDALONE__
# include "wx/platform.h"
#endif
#if wxUSE_SOCKETS || defined(__GSOCKET_STANDALONE__)
#ifndef __GSOCKET_STANDALONE__
#include "wx/msw/gsockmsw.h"
#include "wx/gsocket.h"
extern "C" WXDLLIMPEXP_BASE HINSTANCE wxGetInstance(void);
#define INSTANCE wxGetInstance()
#else /* __GSOCKET_STANDALONE__ */
#include "gsockmsw.h"
#include "gsocket.h"
/* If not using wxWidgets, a global var called hInst must
* be available and it must contain the app's instance
* handle.
*/
extern HINSTANCE hInst;
#define INSTANCE hInst
#endif /* !__GSOCKET_STANDALONE__/__GSOCKET_STANDALONE__ */
#ifndef __WXWINCE__
#include <assert.h>
#else
#define assert(x)
#include <winsock.h>
#include "wx/msw/wince/net.h"
#include "wx/hashmap.h"
WX_DECLARE_HASH_MAP(int,bool,wxIntegerHash,wxIntegerEqual,SocketHash);
#endif
#include <string.h>
#include <stdio.h>
#include <stdlib.h>
#include <stddef.h>
#include <ctype.h>
#include <winsock.h>
#ifdef _MSC_VER
# pragma warning(default:4115) /* named type definition in parentheses */
#endif
#define CLASSNAME TEXT("_GSocket_Internal_Window_Class")
/* implemented in utils.cpp */
extern "C" WXDLLIMPEXP_BASE HWND
wxCreateHiddenWindow(LPCTSTR *pclassname, LPCTSTR classname, WNDPROC wndproc);
/* Maximum number of different GSocket objects at a given time.
* This value can be modified at will, but it CANNOT be greater
* than (0x7FFF - WM_USER + 1)
*/
#define MAXSOCKETS 1024
#if (MAXSOCKETS > (0x7FFF - WM_USER + 1))
#error "MAXSOCKETS is too big!"
#endif
#ifndef __WXWINCE__
typedef int (PASCAL *WSAAsyncSelectFunc)(SOCKET,HWND,u_int,long);
#else
/* Typedef the needed function prototypes and the WSANETWORKEVENTS structure
*/
typedef struct _WSANETWORKEVENTS {
long lNetworkEvents;
int iErrorCode[10];
} WSANETWORKEVENTS, FAR * LPWSANETWORKEVENTS;
typedef HANDLE (PASCAL *WSACreateEventFunc)(void);
typedef int (PASCAL *WSAEventSelectFunc)(SOCKET,HANDLE,long);
typedef int (PASCAL *WSAWaitForMultipleEventsFunc)(long,HANDLE,BOOL,long,BOOL);
typedef int (PASCAL *WSAEnumNetworkEventsFunc)(SOCKET,HANDLE,LPWSANETWORKEVENTS);
#endif //__WXWINCE__
LRESULT CALLBACK _GSocket_Internal_WinProc(HWND, UINT, WPARAM, LPARAM);
/* Global variables */
static HWND hWin;
static CRITICAL_SECTION critical;
static GSocket* socketList[MAXSOCKETS];
static int firstAvailable;
#ifndef __WXWINCE__
static WSAAsyncSelectFunc gs_WSAAsyncSelect = NULL;
#else
static SocketHash socketHash;
static unsigned int currSocket;
HANDLE hThread[MAXSOCKETS];
static WSACreateEventFunc gs_WSACreateEvent = NULL;
static WSAEventSelectFunc gs_WSAEventSelect = NULL;
static WSAWaitForMultipleEventsFunc gs_WSAWaitForMultipleEvents = NULL;
static WSAEnumNetworkEventsFunc gs_WSAEnumNetworkEvents = NULL;
/* This structure will be used to pass data on to the thread that handles socket events.
*/
typedef struct thread_data{
HWND hEvtWin;
unsigned long msgnumber;
unsigned long fd;
unsigned long lEvent;
}thread_data;
#endif
static HMODULE gs_wsock32dll = 0;
#ifdef __WXWINCE__
/* This thread handles socket events on WinCE using WSAEventSelect() as WSAAsyncSelect is not supported.
* When an event occures for the socket, it is checked what kind of event happend and the correct message gets posted
* so that the hidden window can handle it as it would in other MSW builds.
*/
DWORD WINAPI SocketThread(LPVOID data)
{
WSANETWORKEVENTS NetworkEvents;
thread_data* d = (thread_data *)data;
HANDLE NetworkEvent = gs_WSACreateEvent();
gs_WSAEventSelect(d->fd, NetworkEvent, d->lEvent);
while(socketHash[d->fd] == true)
{
if ((gs_WSAWaitForMultipleEvents(1, &NetworkEvent, FALSE,INFINITE, FALSE)) == WAIT_FAILED)
{
printf("WSAWaitForMultipleEvents failed with error %d\n", WSAGetLastError());
return 0;
}
if (gs_WSAEnumNetworkEvents(d->fd ,NetworkEvent, &NetworkEvents) == SOCKET_ERROR)
{
printf("WSAEnumNetworkEvents failed with error %d\n", WSAGetLastError());
return 0;
}
long flags = NetworkEvents.lNetworkEvents;
if (flags & FD_READ)
::PostMessage(d->hEvtWin, d->msgnumber,d->fd, FD_READ);
if (flags & FD_WRITE)
::PostMessage(d->hEvtWin, d->msgnumber,d->fd, FD_WRITE);
if (flags & FD_OOB)
::PostMessage(d->hEvtWin, d->msgnumber,d->fd, FD_OOB);
if (flags & FD_ACCEPT)
::PostMessage(d->hEvtWin, d->msgnumber,d->fd, FD_ACCEPT);
if (flags & FD_CONNECT)
::PostMessage(d->hEvtWin, d->msgnumber,d->fd, FD_CONNECT);
if (flags & FD_CLOSE)
::PostMessage(d->hEvtWin, d->msgnumber,d->fd, FD_CLOSE);
}
gs_WSAEventSelect(d->fd, NetworkEvent, 0);
ExitThread(0);
return 0;
}
#endif
bool GSocketGUIFunctionsTableConcrete::CanUseEventLoop()
{
return true;
}
/* Global initializers */
bool GSocketGUIFunctionsTableConcrete::OnInit()
{
static LPCTSTR pclassname = NULL;
int i;
/* Create internal window for event notifications */
hWin = wxCreateHiddenWindow(&pclassname, CLASSNAME, _GSocket_Internal_WinProc);
if (!hWin)
return false;
/* Initialize socket list */
InitializeCriticalSection(&critical);
for (i = 0; i < MAXSOCKETS; i++)
{
socketList[i] = NULL;
}
firstAvailable = 0;
/* Load WSAAsyncSelect from wsock32.dll (we don't link against it
statically to avoid dependency on wsock32.dll for apps that don't use
sockets): */
#ifndef __WXWINCE__
gs_wsock32dll = LoadLibrary(wxT("wsock32.dll"));
if (!gs_wsock32dll)
return false;
gs_WSAAsyncSelect =(WSAAsyncSelectFunc)GetProcAddress(gs_wsock32dll,
"WSAAsyncSelect");
if (!gs_WSAAsyncSelect)
return false;
#else
/* On WinCE we load ws2.dll which will provide the needed functions.
*/
gs_wsock32dll = LoadLibrary(wxT("ws2.dll"));
if (!gs_wsock32dll)
return false;
gs_WSAEventSelect =(WSAEventSelectFunc)GetProcAddress(gs_wsock32dll,
wxT("WSAEventSelect"));
if (!gs_WSAEventSelect)
return false;
gs_WSACreateEvent =(WSACreateEventFunc)GetProcAddress(gs_wsock32dll,
wxT("WSACreateEvent"));
if (!gs_WSACreateEvent)
return false;
gs_WSAWaitForMultipleEvents =(WSAWaitForMultipleEventsFunc)GetProcAddress(gs_wsock32dll,
wxT("WSAWaitForMultipleEvents"));
if (!gs_WSAWaitForMultipleEvents)
return false;
gs_WSAEnumNetworkEvents =(WSAEnumNetworkEventsFunc)GetProcAddress(gs_wsock32dll,
wxT("WSAEnumNetworkEvents"));
if (!gs_WSAEnumNetworkEvents)
return false;
currSocket = 0;
#endif
return true;
}
void GSocketGUIFunctionsTableConcrete::OnExit()
{
#ifdef __WXWINCE__
/* Delete the threads here */
for(unsigned int i=0; i < currSocket; i++)
CloseHandle(hThread[i]);
#endif
/* Destroy internal window */
DestroyWindow(hWin);
UnregisterClass(CLASSNAME, INSTANCE);
/* Unlock wsock32.dll */
if (gs_wsock32dll)
{
FreeLibrary(gs_wsock32dll);
gs_wsock32dll = 0;
}
/* Delete critical section */
DeleteCriticalSection(&critical);
}
/* Per-socket GUI initialization / cleanup */
bool GSocketGUIFunctionsTableConcrete::Init_Socket(GSocket *socket)
{
int i;
/* Allocate a new message number for this socket */
EnterCriticalSection(&critical);
i = firstAvailable;
while (socketList[i] != NULL)
{
i = (i + 1) % MAXSOCKETS;
if (i == firstAvailable) /* abort! */
{
LeaveCriticalSection(&critical);
return false;
}
}
socketList[i] = socket;
firstAvailable = (i + 1) % MAXSOCKETS;
socket->m_msgnumber = (i + WM_USER);
LeaveCriticalSection(&critical);
return true;
}
void GSocketGUIFunctionsTableConcrete::Destroy_Socket(GSocket *socket)
{
/* Remove the socket from the list */
EnterCriticalSection(&critical);
if ( socket->IsOk() )
{
const int msgnum = socket->m_msgnumber;
// we need to remove any pending messages for this socket to avoid having
// them sent to a new socket which could reuse the same message number as
// soon as we destroy this one
MSG msg;
while ( ::PeekMessage(&msg, hWin, msgnum, msgnum, PM_REMOVE) )
;
socketList[msgnum - WM_USER] = NULL;
}
LeaveCriticalSection(&critical);
}
/* Windows proc for asynchronous event handling */
LRESULT CALLBACK _GSocket_Internal_WinProc(HWND hWnd,
UINT uMsg,
WPARAM wParam,
LPARAM lParam)
{
GSocket *socket;
GSocketEvent event;
GSocketCallback cback;
char *data;
if (uMsg >= WM_USER && uMsg <= (WM_USER + MAXSOCKETS - 1))
{
EnterCriticalSection(&critical);
socket = socketList[(uMsg - WM_USER)];
event = (GSocketEvent) -1;
cback = NULL;
data = NULL;
/* Check that the socket still exists (it has not been
* destroyed) and for safety, check that the m_fd field
* is what we expect it to be.
*/
if ((socket != NULL) && (socket->m_fd == wParam))
{
switch WSAGETSELECTEVENT(lParam)
{
case FD_READ: event = GSOCK_INPUT; break;
case FD_WRITE: event = GSOCK_OUTPUT; break;
case FD_ACCEPT: event = GSOCK_CONNECTION; break;
case FD_CONNECT:
{
if (WSAGETSELECTERROR(lParam) != 0)
event = GSOCK_LOST;
else
event = GSOCK_CONNECTION;
break;
}
case FD_CLOSE: event = GSOCK_LOST; break;
}
if (event != -1)
{
cback = socket->m_cbacks[event];
data = socket->m_data[event];
if (event == GSOCK_LOST)
socket->m_detected = GSOCK_LOST_FLAG;
else
socket->m_detected |= (1 << event);
}
}
/* OK, we can now leave the critical section because we have
* already obtained the callback address (we make no further
* accesses to socket->whatever). However, the app should
* be prepared to handle events from a socket that has just
* been closed!
*/
LeaveCriticalSection(&critical);
if (cback != NULL)
(cback)(socket, event, data);
return (LRESULT) 0;
}
else
return DefWindowProc(hWnd, uMsg, wParam, lParam);
}
/* _GSocket_Enable_Events:
* Enable all event notifications; we need to be notified of all
* events for internal processing, but we will only notify users
* when an appropiate callback function has been installed.
*/
void GSocketGUIFunctionsTableConcrete::Enable_Events(GSocket *socket)
{
assert (socket != NULL);
if (socket->m_fd != INVALID_SOCKET)
{
/* We could probably just subscribe to all events regardless
* of the socket type, but MS recommends to do it this way.
*/
long lEvent = socket->m_server?
FD_ACCEPT : (FD_READ | FD_WRITE | FD_CONNECT | FD_CLOSE);
#ifndef __WXWINCE__
gs_WSAAsyncSelect(socket->m_fd, hWin, socket->m_msgnumber, lEvent);
#else
/*
* WinCE creates a thread for socket event handling.
* All needed parameters get passed through the thread_data structure.
*/
thread_data* d = new thread_data;
d->lEvent = lEvent;
d->hEvtWin = hWin;
d->msgnumber = socket->m_msgnumber;
d->fd = socket->m_fd;
socketHash[socket->m_fd] = true;
hThread[currSocket++] = CreateThread(NULL, 0, &SocketThread,(LPVOID)d, 0, NULL);
#endif
}
}
/* _GSocket_Disable_Events:
* Disable event notifications (when shutdowning the socket)
*/
void GSocketGUIFunctionsTableConcrete::Disable_Events(GSocket *socket)
{
assert (socket != NULL);
if (socket->m_fd != INVALID_SOCKET)
{
#ifndef __WXWINCE__
gs_WSAAsyncSelect(socket->m_fd, hWin, socket->m_msgnumber, 0);
#else
//Destroy the thread
socketHash[socket->m_fd] = false;
#endif
}
}
#else /* !wxUSE_SOCKETS */
/*
* Translation unit shouldn't be empty, so include this typedef to make the
* compiler (VC++ 6.0, for example) happy
*/
typedef void (*wxDummy)();
#endif /* wxUSE_SOCKETS || defined(__GSOCKET_STANDALONE__) */

1848
Source/3rd Party/wx/src/msw/tbar95.cpp Normal file
View File

File diff suppressed because it is too large Load Diff

4
Source/3rd Party/wx/src/msw/utils.cpp
View File

@ -20,6 +20,10 @@
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#if defined(__WXMSW__)
#include <winsock.h>
#endif
#ifdef __BORLANDC__
#pragma hdrstop
#endif

3
Source/3rd Party/wx/wx_base.vcproj
View File

@ -41,7 +41,6 @@
PreprocessorDefinitions="_LIB;__WXMSW__;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1"
PrecompiledHeaderThrough="wx/wxprec.h"
DisableSpecificWarnings="4005"
UndefinePreprocessorDefinitions="WIN32_LEAN_AND_MEAN"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@ -110,7 +109,7 @@
/>
<Tool
Name="VCLibrarianTool"
OutputFile="$(OutDir)\lib\wxbase29.lib"
OutputFile="$(OutDir)\lib\wxbase28.lib"
/>
<Tool
Name="VCALinkTool"

45
Source/3rd Party/wx/wx_core.vcproj
View File

@ -53,7 +53,7 @@
/>
<Tool
Name="VCLibrarianTool"
AdditionalDependencies="Comctl32.lib"
AdditionalDependencies="Comctl32.lib Rpcrt4.lib"
OutputFile="$(OutDir)\lib\wxmsw28d_core.lib"
/>
<Tool
@ -110,7 +110,8 @@
/>
<Tool
Name="VCLibrarianTool"
OutputFile="$(OutDir)\lib\wxmsw29_core.lib"
AdditionalDependencies="Comctl32.lib Rpcrt4.lib"
OutputFile="$(OutDir)\lib\wxmsw28_core.lib"
/>
<Tool
Name="VCALinkTool"
@ -279,6 +280,10 @@
RelativePath="src\common\event.cpp"
>
</File>
<File
RelativePath=".\src\common\evtloopcmn.cpp"
>
</File>
<File
RelativePath="src\common\fddlgcmn.cpp"
>
@ -491,6 +496,10 @@
RelativePath="src\common\textcmn.cpp"
>
</File>
<File
RelativePath=".\src\common\timercmn.cpp"
>
</File>
<File
RelativePath="src\common\toplvcmn.cpp"
>
@ -779,6 +788,10 @@
/>
</FileConfiguration>
</File>
<File
RelativePath=".\src\msw\gsockmsw.cpp"
>
</File>
<File
RelativePath="src\msw\helpchm.cpp"
>
@ -951,6 +964,10 @@
RelativePath="src\msw\statbox.cpp"
>
</File>
<File
RelativePath=".\src\msw\statbr95.cpp"
>
</File>
<File
RelativePath="src\msw\statline.cpp"
>
@ -959,6 +976,10 @@
RelativePath="src\msw\stattext.cpp"
>
</File>
<File
RelativePath=".\src\msw\tbar95.cpp"
>
</File>
<File
RelativePath="src\msw\textctrl.cpp"
>
@ -967,6 +988,10 @@
RelativePath="src\msw\tglbtn.cpp"
>
</File>
<File
RelativePath=".\src\msw\timer.cpp"
>
</File>
<File
RelativePath="src\msw\tooltip.cpp"
>
@ -3738,11 +3763,11 @@
>
</File>
<File
RelativePath="include\wx\persist\splitter.h"
RelativePath="include\wx\splitter.h"
>
</File>
<File
RelativePath="include\wx\splitter.h"
RelativePath="include\wx\persist\splitter.h"
>
</File>
<File
@ -3826,11 +3851,11 @@
>
</File>
<File
RelativePath="include\wx\ribbon\toolbar.h"
RelativePath="include\wx\toolbar.h"
>
</File>
<File
RelativePath="include\wx\toolbar.h"
RelativePath="include\wx\ribbon\toolbar.h"
>
</File>
<File
@ -3842,11 +3867,11 @@
>
</File>
<File
RelativePath="include\wx\persist\toplevel.h"
RelativePath="include\wx\toplevel.h"
>
</File>
<File
RelativePath="include\wx\toplevel.h"
RelativePath="include\wx\persist\toplevel.h"
>
</File>
<File
@ -3854,11 +3879,11 @@
>
</File>
<File
RelativePath="include\wx\persist\treebook.h"
RelativePath="include\wx\treebook.h"
>
</File>
<File
RelativePath="include\wx\treebook.h"
RelativePath="include\wx\persist\treebook.h"
>
</File>
<File

2
Source/Glide64/Gfx_1.3.h
View File

@ -234,9 +234,9 @@ extern std::ofstream rdp_err;
#define RDP_E(x)
#endif
#ifdef RDP_LOGGING
__inline void FRDP (const char *fmt, ...)
{
#ifdef RDP_LOGGING
if (!settings.logging || !log_open) return;
#ifdef LOGNOTKEY

2
Source/Glide64/Glide64.vcproj
View File

@ -99,7 +99,7 @@
/>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="&quot;$(Root)Source/3rd Party/wx/include&quot;;&quot;$(Root)Source/3rd Party/wx/include/msvc&quot;;inc"
AdditionalIncludeDirectories="&quot;$(Root)Source\3rd Party\sdl\include&quot;;&quot;$(Root)Source/3rd Party/wx/include&quot;;&quot;$(Root)Source/3rd Party/wx/include/msvc&quot;;&quot;$(Root)Source/Glitch64/inc&quot;;inc"
PreprocessorDefinitions="__MSC__"
UsePrecompiledHeader="0"
/>

2
Source/GlideHQ/GlideHQ.vcproj
View File

@ -91,7 +91,7 @@
/>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="&quot;$(Root)Source/3rd Party/wx/src&quot;"
AdditionalIncludeDirectories="&quot;$(Root)Source/3rd Party/wx/include/msvc&quot;;&quot;$(Root)Source/3rd Party/wx/include&quot;;&quot;$(Root)Source/3rd Party/wx/src/zlib&quot;;&quot;$(Root)Source/3rd Party/wx/src&quot;"
UsePrecompiledHeader="0"
WarningLevel="3"
/>

2
Source/Glitch64/Glitch64.vcproj
View File

@ -91,7 +91,7 @@
/>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="inc"
AdditionalIncludeDirectories="&quot;$(Root)Source/3rd Party/sdl/include&quot;;inc"
UsePrecompiledHeader="0"
/>
<Tool