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

[Windows] Add missing dlls and enable OpenMP support.

This commit is contained in:
Matthew Parlane 2013-11-03 11:54:45 +13:00
parent e22ff4927a
commit dab9af43a4
11 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -13,7 +13,10 @@ Source/Core/Common/Src/scmrev.h
*.sdf *.sdf
*.suo *.suo
*.vcxproj.user *.vcxproj.user
*.obj
# Ignore files created by posix people # Ignore files created by posix people
*~ *~
# Ignore transifix configuration directory # Ignore transifix configuration directory
.tx .tx
# Ignore tlog files
*.tlog

BIN
Externals/msvcrt/Win32/msvcp120.dll vendored Normal file
View File

Binary file not shown.

BIN
Externals/msvcrt/Win32/msvcr120.dll vendored Normal file
View File

Binary file not shown.

BIN
Externals/msvcrt/Win32/vcomp100.dll vendored
View File

Binary file not shown.

BIN
Externals/msvcrt/Win32/vcomp120.dll vendored Normal file
View File

Binary file not shown.

BIN
Externals/msvcrt/x64/msvcp120.dll vendored Normal file
View File

Binary file not shown.

BIN
Externals/msvcrt/x64/msvcr120.dll vendored Normal file
View File

Binary file not shown.

BIN
Externals/msvcrt/x64/vcomp100.dll vendored
View File

Binary file not shown.

BIN
Externals/msvcrt/x64/vcomp120.dll vendored Normal file
View File

Binary file not shown.

2
Source/Core/DolphinWX/DolphinWX.vcxproj
View File

@ -228,7 +228,7 @@
<!--Copy Exe, Pdb, Data directory and DLLs which should be located in the executable directory--> <!--Copy Exe, Pdb, Data directory and DLLs which should be located in the executable directory-->
<ItemGroup> <ItemGroup>
<DataDirFiles Include="$(SolutionDir)..\Data\**\*.*" /> <DataDirFiles Include="$(SolutionDir)..\Data\**\*.*" />
<ExternalDlls Include="$(SolutionDir)..\Externals\OpenAL\$(PlatformName)\*.dll;$(SolutionDir)..\Externals\SDL2-2.0.0\lib\$(PlatformName)\*.dll" /> <ExternalDlls Include="$(ExternalsDir)OpenAL\$(PlatformName)\*.dll;$(ExternalsDir)SDL2-2.0.0\lib\$(PlatformName)\*.dll;$(ExternalsDir)msvcrt\$(PlatformName)\*.dll" />
<BinaryFiles Include="$(TargetPath);$(TargetDir)$(TargetName).pdb" /> <BinaryFiles Include="$(TargetPath);$(TargetDir)$(TargetName).pdb" />
<AllInputFiles Include="@(DataDirFiles);@(ExternalDlls);@(BinaryFiles)" /> <AllInputFiles Include="@(DataDirFiles);@(ExternalDlls);@(BinaryFiles)" />
</ItemGroup> </ItemGroup>

1
Source/VSProps/Base.props
View File

@ -74,6 +74,7 @@
seem to be a way to only ignore the specific instance we don't care about... seem to be a way to only ignore the specific instance we don't care about...
--> -->
<DisableSpecificWarnings>4996</DisableSpecificWarnings> <DisableSpecificWarnings>4996</DisableSpecificWarnings>
<OpenMPSupport>true</OpenMPSupport>
</ClCompile> </ClCompile>
<!--ClCompile Base:StaticLibrary--> <!--ClCompile Base:StaticLibrary-->
<ClCompile Condition="'$(ConfigurationType)'=='StaticLibrary'"> <ClCompile Condition="'$(ConfigurationType)'=='StaticLibrary'">