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

Fixed include directories in wxCore and wxBase

This commit is contained in:
Julio C. Rocha 2015-10-23 23:42:31 -07:00
parent 75aef28525
commit 58315f8b02
2 changed files with 19 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
Source/3rd Party/wx/wx_base.vcxproj
View File

@ -38,7 +38,8 @@
</PropertyGroup>
<ItemDefinitionGroup>
<ClCompile>
<AdditionalIncludeDirectories>lib\vc_lib\mswud;include;src\tiff\libtiff;src\jpeg;src\png;src\zlib;src\regex;src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories Condition="'$(Configuration)'=='Debug'">lib\vc_lib\mswud;include;src\tiff\libtiff;src\jpeg;src\png;src\zlib;src\regex;src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories Condition="'$(Configuration)'=='Release'">lib\vc_lib\mswu;include;src\tiff\libtiff;src\jpeg;src\png;src\zlib;src\regex;src\expat\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_LIB;__WXMSW__;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PrecompiledHeaderFile>wx/wxprec.h</PrecompiledHeaderFile>
<DisableSpecificWarnings>4005;%(DisableSpecificWarnings)</DisableSpecificWarnings>
@ -153,14 +154,14 @@
</ItemGroup>
<ItemGroup>
<CustomBuild Include="include\wx\msw\setup.h">
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Creating lib\vc_lib\mswud\wx\setup.h</Message>
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">copy "%(FullPath)" lib\vc_lib\mswud\wx\setup.h
<Message Condition="'$(Configuration)'=='Debug'">Creating lib\vc_lib\mswud\wx\setup.h</Message>
<Command Condition="'$(Configuration)'=='Debug'">copy "%(FullPath)" lib\vc_lib\mswud\wx\setup.h
</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">lib\vc_lib\mswud\wx\setup.h;%(Outputs)</Outputs>
<Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Creating lib\vc_lib\mswu\wx\setup.h</Message>
<Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">copy "%(FullPath)" lib\vc_lib\mswu\wx\setup.h
<Outputs Condition="'$(Configuration)'=='Debug'">lib\vc_lib\mswud\wx\setup.h;%(Outputs)</Outputs>
<Message Condition="'$(Configuration)'=='Release'">Creating lib\vc_lib\mswu\wx\setup.h</Message>
<Command Condition="'$(Configuration)'=='Release'">copy "%(FullPath)" lib\vc_lib\mswu\wx\setup.h
</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">lib\vc_lib\mswu\wx\setup.h;%(Outputs)</Outputs>
<Outputs Condition="'$(Configuration)'=='Release'">lib\vc_lib\mswu\wx\setup.h;%(Outputs)</Outputs>
</CustomBuild>
<ClInclude Include="include\wx\msw\apptbase.h" />
<ClInclude Include="include\wx\msw\apptrait.h" />
@ -170,14 +171,12 @@
<ClInclude Include="include\wx\msw\debughlp.h" />
<ClInclude Include="include\wx\msw\fswatcher.h" />
<CustomBuild Include="include\wx\msw\genrcdefs.h">
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Creating lib\vc_lib\mswud\wx\msw\rcdefs.h</Message>
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">cl /EP /nologo "%(FullPath)" &gt; "lib\vc_lib\mswud\wx\msw\rcdefs.h"
</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">lib\vc_lib\mswud\wx\msw\rcdefs.h;%(Outputs)</Outputs>
<Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Creating lib\vc_lib\mswu\wx\msw\rcdefs.h</Message>
<Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">cl /EP /nologo "%(FullPath)" &gt; "lib\vc_lib\mswu\wx\msw\rcdefs.h"
</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">lib\vc_lib\mswu\wx\msw\rcdefs.h;%(Outputs)</Outputs>
<Message Condition="'$(Configuration)'=='Debug'">Creating lib\vc_lib\mswud\wx\msw\rcdefs.h</Message>
<Command Condition="'$(Configuration)'=='Debug'">cl /EP /nologo "%(FullPath)" &gt; "lib\vc_lib\mswud\wx\msw\rcdefs.h"</Command>
<Outputs Condition="'$(Configuration)'=='Debug'">lib\vc_lib\mswud\wx\msw\rcdefs.h;%(Outputs)</Outputs>
<Message Condition="'$(Configuration)'=='Release'">Creating lib\vc_lib\mswu\wx\msw\rcdefs.h</Message>
<Command Condition="'$(Configuration)'=='Release'">cl /EP /nologo "%(FullPath)" &gt; "lib\vc_lib\mswu\wx\msw\rcdefs.h"</Command>
<Outputs Condition="'$(Configuration)'=='Release'">lib\vc_lib\mswu\wx\msw\rcdefs.h;%(Outputs)</Outputs>
</CustomBuild>
<ClInclude Include="include\wx\msw\libraries.h" />
<ClInclude Include="include\wx\msw\mimetype.h" />

16
Source/3rd Party/wx/wx_core.vcxproj
View File

@ -38,7 +38,7 @@
</PropertyGroup>
<ItemDefinitionGroup>
<ClCompile>
<AdditionalIncludeDirectories>$(Root)Source\3rd Party\wx\lib\vc_lib\mswd;$(Root)Source\3rd Party\wx\include;$(Root)Source\3rd Party\wx\src\tiff\libtiff;$(Root)Source\3rd Party\wx\src\jpeg;$(Root)Source\3rd Party\wx\src\png;$(Root)Source\3rd Party\wx\src\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(Root)Source\3rd Party\wx\lib\vc_lib\msw;$(Root)Source\3rd Party\wx\include;$(Root)Source\3rd Party\wx\src\tiff\libtiff;$(Root)Source\3rd Party\wx\src\jpeg;$(Root)Source\3rd Party\wx\src\png;$(Root)Source\3rd Party\wx\src\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_LIB;__WXMSW__;__WXDEBUG__;WXBUILDING;wxUSE_BASE=0;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PrecompiledHeaderFile>wx/wxprec.h</PrecompiledHeaderFile>
<DisableSpecificWarnings>4005;%(DisableSpecificWarnings)</DisableSpecificWarnings>
@ -226,13 +226,7 @@
<ClCompile Include="src\msw\nativdlg.cpp" />
<ClCompile Include="src\msw\notebook.cpp" />
<ClCompile Include="src\msw\ole\oleutils.cpp">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<PrecompiledHeader>
</PrecompiledHeader>
</ClCompile>
<ClCompile Include="src\msw\ownerdrw.cpp" />
@ -309,9 +303,9 @@
<Message Condition="'$(Configuration)'=='Debug'">Creating lib\vc_lib\mswd\wx\setup.h</Message>
<Command Condition="'$(Configuration)'=='Debug'">copy "%(FullPath)" lib\vc_lib\mswd\wx\setup.h</Command>
<Outputs Condition="'$(Configuration)'=='Debug'">lib\vc_lib\mswd\wx\setup.h;%(Outputs)</Outputs>
<Message Condition="'$(Configuration)'=='Release'">Creating lib\vc_lib\mswu\wx\setup.h</Message>
<Command Condition="'$(Configuration)'=='Release'">copy "%(FullPath)" lib\vc_lib\mswu\wx\setup.h</Command>
<Outputs Condition="'$(Configuration)'=='Release'">lib\vc_lib\mswu\wx\setup.h;%(Outputs)</Outputs>
<Message Condition="'$(Configuration)'=='Release'">Creating lib\vc_lib\msw\wx\setup.h</Message>
<Command Condition="'$(Configuration)'=='Release'">copy "%(FullPath)" lib\vc_lib\msw\wx\setup.h</Command>
<Outputs Condition="'$(Configuration)'=='Release'">lib\vc_lib\msw\wx\setup.h;%(Outputs)</Outputs>
</CustomBuild>
<ClInclude Include="include\wx\msw\accel.h" />
<ClInclude Include="include\wx\msw\ole\activex.h" />