[Windows] Add missing dlls and enable OpenMP support.

dolphin-emu · Nov 2, 2013 · dab9af4 · dab9af4
1 parent e22ff49
commit dab9af4
Show file tree

Hide file tree

Showing 11 changed files with 5 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -13,7 +13,10 @@ Source/Core/Common/Src/scmrev.h
 *.sdf
 *.suo
 *.vcxproj.user
+*.obj
 # Ignore files created by posix people
 *~
 # Ignore transifix configuration directory
 .tx
+# Ignore tlog files
+*.tlog
diff --git a/Externals/msvcrt/Win32/msvcp120.dll b/Externals/msvcrt/Win32/msvcp120.dll
diff --git a/Externals/msvcrt/Win32/msvcr120.dll b/Externals/msvcrt/Win32/msvcr120.dll
diff --git a/Externals/msvcrt/Win32/vcomp100.dll b/Externals/msvcrt/Win32/vcomp100.dll
diff --git a/Externals/msvcrt/Win32/vcomp120.dll b/Externals/msvcrt/Win32/vcomp120.dll
diff --git a/Externals/msvcrt/x64/msvcp120.dll b/Externals/msvcrt/x64/msvcp120.dll
diff --git a/Externals/msvcrt/x64/msvcr120.dll b/Externals/msvcrt/x64/msvcr120.dll
diff --git a/Externals/msvcrt/x64/vcomp100.dll b/Externals/msvcrt/x64/vcomp100.dll
diff --git a/Externals/msvcrt/x64/vcomp120.dll b/Externals/msvcrt/x64/vcomp120.dll
diff --git a/Source/Core/DolphinWX/DolphinWX.vcxproj b/Source/Core/DolphinWX/DolphinWX.vcxproj
@@ -228,7 +228,7 @@
   <!--Copy Exe, Pdb, Data directory and DLLs which should be located in the executable directory-->
   <ItemGroup>
     <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" />
     <AllInputFiles Include="@(DataDirFiles);@(ExternalDlls);@(BinaryFiles)" />
   </ItemGroup>

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