piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-06-28 01:49:33 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fixed DebugFast wxAdv28 build to avoid wxOnAssert linking errors

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1457 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
John Peterson
2008-12-09 14:07:51 +00:00
parent 3c63813971
commit 5c75ba6177
3 changed files with 50 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Externals/wxWidgets/build/msw/wx_adv.vcproj vendored
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
Version="9.00"
Version="9,00"
Name="wxAdv28"
ProjectGUID="{71B16F46-0B00-4EDA-B253-D6D9D03A215C}"
TargetFrameworkVersion="0"
@ -123,9 +123,9 @@
AdditionalOptions="/EHsc "
Optimization="0"
AdditionalIncludeDirectories="..\..\Include;..\..\Include\msvc;..\..\..\zlib;..\..\src\png"
PreprocessorDefinitions="WIN32;_LIB;_DEBUG;__WXMSW__;__WXDEBUG__"
PreprocessorDefinitions="WIN32;_LIB;__WXMSW__"
MinimalRebuild="true"
RuntimeLibrary="3"
RuntimeLibrary="0"
RuntimeTypeInfo="true"
UsePrecompiledHeader="2"
PrecompiledHeaderThrough="wx/wxprec.h"
@ -2128,10 +2128,6 @@
<Filter
Name="Setup Headers"
>
<File
RelativePath="..\..\include\wx\univ\setup.h"
>
</File>
<File
RelativePath="..\..\include\wx\msw\setup.h"
>
@ -2196,6 +2192,10 @@
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\include\wx\univ\setup.h"
>
</File>
</Filter>
<Filter
Name="MSW Headers"

41
Externals/wxWidgets/include/msvc/wx/setup.h vendored
View File

@ -9,6 +9,47 @@
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// =======================================================
// A guide to all the setup.h versions
// -------------
/* The included setup files are:
include\msvc\wx\setup.h + This file
include\wx\msw\wince\setup.h - Not used in regular builds
lib\vc_lib\msw\wx\setup.h + Library configuration, Release and DebugFast builds
lib\vc_lib\mswd\wx\setup.h + Library configuration, Debug builds
lib\vc_dll\msw\wx\setup.h - Not used, dll version only
lib\vc_dll\mswd\wx\setup.h - Not used, dll version only
These are identical or almost identical and I'm not sure which one that applies
in case they are different:
include\wx\setup.h ?
include\wx\msw\setup.h ?
include\wx\univ\setup.h ?
include\wx\msw\setup0.h - The original univ file, not used
The configuration consistency check files:
include\wx\chkconf.h ?
include\wx\msw\chkconf.h ?
include\wx\univ\chkconf.h ?
include\wx\msw\wince\chkconf.h - Not used in regular builds
Issues:
The Debug build will break in CFrame::InitBitmaps() at the ConvertToImage() line
with a "assert "wxWidgets Debug Alert, bmp.Ok()" error message, the cause is unknown,
to me at least.
*/
// =============
// VC++ IDE predefines _DEBUG and _UNICODE for the new projects itself, but
// the other symbols (WXUSINGDLL, __WXUNIVERSAL__, ...) should be defined
// explicitly!