emu-mirror/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-12-29 05:20:53 +01:00
Code Issues Packages Projects Releases Wiki Activity
8a887a6fea
dolphin/Source/VSProps/Base.props

38 lines
1.8 KiB
Plaintext
Raw Normal View History

Add UPnP support. Feedback is in logs as suggested by skid_au. The checkbox is still there, but mostly for people who would like to opt out (unfortunately, I can not be sure how this feature may behave for some routers - there's a hell of a lot of bad UPnP implementations.) The Visual Studio stuff is a little messy, so I apologize if anything is a bit off. I tested most configurations and it worked. I also tested CMake on Debian Wheezy, Ubuntu Saucy, and Mac OS X Mountain Lion. All seemed to be OK.
2013-07-09 02:13:02 +02:00
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ImportGroup Label="PropertySheets" />
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<IntDir>$(Platform)\$(Configuration)\</IntDir>
<OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
</PropertyGroup>
Don't prepend file:// in wxUtils::Explore() on windows. Wxw will just remove it, and/or blow up trying to remove it, if the path isn't ascii. This fixes issue 6721. (cherry picked from commit cc05f66ba1a0c4641b4dc19b77b252470d346350) Fix unicode support for File::Rename() on windows. Partial fix of issue 6721. (cherry picked from commit 99c89ae10961f84192cdbfc501b4ff45a559dcd1) Missed a accept error handler. Init instead of memset. (cherry picked from commit 935ed814eaff19094c96fdd38642b980e85c078f) Fix accept() bug, which was using the wrong isRW for error conversion. Also fixed a debug issue where local_name is used uninitialised. (cherry picked from commit f811dbb57516b6f3a34637bd1c8c8299ceea20e4) Only add real HID devices to HID list. (cherry picked from commit e805bf60685bb5f4bd5ac1bf0a290519a678e5b4) Add dxsdk_dir to vc++ paths via base.props. This means you no longer need the paths in a global property sheet. In fact if you have them in such a file, you should remove them as it will cause conflicts with the vs2013 build. (cherry picked from commit 0791a9ef80889ffb70c67fbd6491635b0014747b)
2013-11-28 15:04:22 +01:00
<PropertyGroup Condition="'$(Platform)'=='Win32'">
<IncludePath>$(DXSDK_DIR)Include;$(IncludePath)</IncludePath>
<LibraryPath>$(DXSDK_DIR)Lib\x86;$(LibraryPath)</LibraryPath>
<ExecutablePath>$(DXSDK_DIR)Utilities\Bin\x86;$(ExecutablePath)</ExecutablePath>
</PropertyGroup>
<PropertyGroup Condition="'$(Platform)'=='x64'">
<IncludePath>$(DXSDK_DIR)Include;$(IncludePath)</IncludePath>
<LibraryPath>$(DXSDK_DIR)Lib\x64;$(LibraryPath)</LibraryPath>
<ExecutablePath>$(DXSDK_DIR)Utilities\Bin\x64;$(ExecutablePath)</ExecutablePath>
</PropertyGroup>
Add UPnP support. Feedback is in logs as suggested by skid_au. The checkbox is still there, but mostly for people who would like to opt out (unfortunately, I can not be sure how this feature may behave for some routers - there's a hell of a lot of bad UPnP implementations.) The Visual Studio stuff is a little messy, so I apologize if anything is a bit off. I tested most configurations and it worked. I also tested CMake on Debian Wheezy, Ubuntu Saucy, and Mac OS X Mountain Lion. All seemed to be OK.
2013-07-09 02:13:02 +02:00
<ItemDefinitionGroup>
<ClCompile>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;USE_UPNP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<WarningLevel>Level3</WarningLevel>
<IntrinsicFunctions>true</IntrinsicFunctions>
<StructMemberAlignment>16Bytes</StructMemberAlignment>
<FunctionLevelLinking>true</FunctionLevelLinking>
<RuntimeTypeInfo>false</RuntimeTypeInfo>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<GenerateDebugInformation>true</GenerateDebugInformation>
<BaseAddress>0x00400000</BaseAddress>
</Link>
<ResourceCompile>
<AdditionalIncludeDirectories>..\..\..\Externals\wxWidgets3\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
</ItemDefinitionGroup>
<ItemGroup />
vs2010: buildfix move much of the build settings to .props files -please use them as much as possible in the future, instead of changing individual projects NOTE: to avoid left over blobs, clean your builds *before* applying these changes. TODO: add DebugFast target for projects that are lacking it. Lack of DebugFast targets cause the linker to use LTCG when we don't want it. please test for regressions which could be caused by being too happy with compiler flags :) git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7109 8ced0084-cf51-0410-be5f-012b33b47a6e
2011-02-08 05:03:48 +01:00
</Project>
Reference in New Issue Copy Permalink