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

[Project64] Trying to get wx to compile

This commit is contained in:
zilmar 2015-11-22 22:36:51 +11:00
parent b5a4dc4eef
commit fa60e55f57
12 changed files with 37 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Source/3rd Party/wx/src/common/filename.cpp
View File

@ -103,6 +103,7 @@
#include <shlobj.h> // for CLSID_ShellLink
#include "wx/msw/missing.h"
#include "wx/msw/ole/oleutils.h"
#include <Shellapi.h>
#endif
#if defined(__WXMAC__)

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

@ -39,6 +39,10 @@
#include "wx/math.h"
#endif
#ifdef __WXMSW__
#include <CdErr.h>
#endif
#include <stdlib.h>
#include <string.h>

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

@ -55,6 +55,10 @@
#include <shellapi.h>
#endif
#ifdef __WXMSW__
#include <shellapi.h>
#endif
#include "wx/file.h"
#include "wx/listimpl.cpp"

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

@ -15,6 +15,9 @@
#endif
#include "wx/dc.h"
#include <rpc.h>
#include <rpcndr.h>
#include <Unknwn.h>
#if wxUSE_GRAPHICS_CONTEXT

2
Source/3rd Party/wx/src/msw/ole/activex.cpp
View File

@ -531,7 +531,7 @@ public:
#elif defined(_UNICODE)
GetObjectW
#else
GetObjectA
GetObject
#endif
(LPOLESTR pszItem, DWORD, IBindCtx *, REFIID, void ** ppvObject)
{

1
Source/3rd Party/wx/src/msw/ole/dataobj.cpp
View File

@ -49,6 +49,7 @@
#include <oleauto.h>
#include <shlobj.h>
#include <ShellAPI.h>
#include "wx/msw/ole/oleutils.h"

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

@ -41,6 +41,10 @@
#define UUID_DEFINED
#endif
#ifdef __WXMSW__
#include <Rpc.h>
#endif
// OLE
#ifndef __WXWINCE__
#include "wx/msw/ole/uuid.h"

5
Source/3rd Party/wx/src/msw/printdlg.cpp
View File

@ -34,6 +34,11 @@
#include "wx/cmndata.h"
#endif
#ifdef __WXMSW__
#include <WinSpool.h>
#include <CdErr.h>
#endif
#include "wx/printdlg.h"
#include "wx/msw/printdlg.h"
#include "wx/msw/dcprint.h"

1
Source/3rd Party/wx/src/msw/textctrl.cpp
View File

@ -55,6 +55,7 @@
#include "wx/msw/private.h"
#include "wx/msw/winundef.h"
#include "wx/msw/mslu.h"
#include <OleIdl.h>
#include <string.h>
#include <stdlib.h>

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

@ -18,6 +18,7 @@
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#include <Winsock2.h>
#ifdef __BORLANDC__
#pragma hdrstop

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

@ -53,7 +53,7 @@
/>
<Tool
Name="VCLibrarianTool"
OutputFile="$(OutDir)\lib\wxbase28d.lib"
OutputFile="$(OutDir)\lib\wxbase30d.lib"
/>
<Tool
Name="VCALinkTool"
@ -109,7 +109,7 @@
/>
<Tool
Name="VCLibrarianTool"
OutputFile="$(OutDir)\lib\wxbase28.lib"
OutputFile="$(OutDir)\lib\wxbase30.lib"
/>
<Tool
Name="VCALinkTool"
@ -166,10 +166,6 @@
RelativePath="src\common\convauto.cpp"
>
</File>
<File
RelativePath=".\src\common\datacmn.cpp"
>
</File>
<File
RelativePath="src\common\datetime.cpp"
>
@ -430,10 +426,6 @@
RelativePath="src\common\wfstream.cpp"
>
</File>
<File
RelativePath=".\src\common\wxchar.cpp"
>
</File>
<File
RelativePath="src\common\xti.cpp"
>

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

@ -54,7 +54,7 @@
<Tool
Name="VCLibrarianTool"
AdditionalDependencies="Comctl32.lib Rpcrt4.lib"
OutputFile="$(OutDir)\lib\wxmsw28d_core.lib"
OutputFile="$(OutDir)\lib\wxmsw30d_core.lib"
/>
<Tool
Name="VCALinkTool"
@ -111,7 +111,7 @@
<Tool
Name="VCLibrarianTool"
AdditionalDependencies="Comctl32.lib Rpcrt4.lib"
OutputFile="$(OutDir)\lib\wxmsw28_core.lib"
OutputFile="$(OutDir)\lib\wxmsw30_core.lib"
/>
<Tool
Name="VCALinkTool"
@ -788,10 +788,6 @@
/>
</FileConfiguration>
</File>
<File
RelativePath=".\src\msw\gsockmsw.cpp"
>
</File>
<File
RelativePath="src\msw\helpchm.cpp"
>
@ -944,10 +940,6 @@
RelativePath="src\msw\settings.cpp"
>
</File>
<File
RelativePath=".\src\msw\slider95.cpp"
>
</File>
<File
RelativePath="src\msw\spinbutt.cpp"
>
@ -964,10 +956,6 @@
RelativePath="src\msw\statbox.cpp"
>
</File>
<File
RelativePath=".\src\msw\statbr95.cpp"
>
</File>
<File
RelativePath="src\msw\statline.cpp"
>
@ -976,10 +964,6 @@
RelativePath="src\msw\stattext.cpp"
>
</File>
<File
RelativePath=".\src\msw\tbar95.cpp"
>
</File>
<File
RelativePath="src\msw\textctrl.cpp"
>
@ -1274,10 +1258,6 @@
RelativePath="src\generic\numdlgg.cpp"
>
</File>
<File
RelativePath=".\src\generic\panelg.cpp"
>
</File>
<File
RelativePath="src\generic\printps.cpp"
>
@ -3763,11 +3743,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
@ -3851,11 +3831,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
@ -3867,11 +3847,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
@ -3879,11 +3859,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