diff --git a/Source/Core/DolphinWX/Dolphin.vcxproj b/Source/Core/DolphinWX/Dolphin.vcxproj index 0d80b1fa5b..e972e266d6 100644 --- a/Source/Core/DolphinWX/Dolphin.vcxproj +++ b/Source/Core/DolphinWX/Dolphin.vcxproj @@ -150,7 +150,6 @@ xcopy "$(SolutionDir)..\Externals\SDL\$(PlatformName)\*.dll" "$(TargetDir)" /e / xcopy "$(SolutionDir)..\Data" "$(TargetDir)" /e /s /y /d echo Copying External .dlls -xcopy "$(SolutionDir)..\Externals\Cg64\*.dll" "$(TargetDir)" /e /s /y /q /d xcopy "$(SolutionDir)..\Externals\SDL\$(PlatformName)\*.dll" "$(TargetDir)" /e /s /y /q /d Copying Data\* to $(TargetDir) @@ -196,7 +195,6 @@ xcopy "$(SolutionDir)..\Externals\SDL\$(PlatformName)\*.dll" "$(TargetDir)" /e / xcopy "$(SolutionDir)..\Data" "$(TargetDir)" /e /s /y /d echo Copying External .dlls -xcopy "$(SolutionDir)..\Externals\Cg64\*.dll" "$(TargetDir)" /e /s /y /q /d xcopy "$(SolutionDir)..\Externals\SDL\$(PlatformName)\*.dll" "$(TargetDir)" /e /s /y /q /d Copying Data\* to $(TargetDir) @@ -212,7 +210,6 @@ xcopy "$(SolutionDir)..\Externals\SDL\$(PlatformName)\*.dll" "$(TargetDir)" /e / xcopy "$(SolutionDir)..\Data" "$(TargetDir)" /e /s /y /d echo Copying External .dlls -xcopy "$(SolutionDir)..\Externals\Cg64\*.dll" "$(TargetDir)" /e /s /y /q /d xcopy "$(SolutionDir)..\Externals\SDL\$(PlatformName)\*.dll" "$(TargetDir)" /e /s /y /q /d Copying Data\* to $(TargetDir) diff --git a/Source/Plugins/Plugin_VideoOGL/Plugin_VideoOGL.vcxproj b/Source/Plugins/Plugin_VideoOGL/Plugin_VideoOGL.vcxproj index 595d19f5c0..d46fe6330b 100644 --- a/Source/Plugins/Plugin_VideoOGL/Plugin_VideoOGL.vcxproj +++ b/Source/Plugins/Plugin_VideoOGL/Plugin_VideoOGL.vcxproj @@ -121,7 +121,7 @@ true - opengl32.lib;cg.lib;cgGL.lib;glu32.lib;glew32s.lib;%(AdditionalDependencies) + opengl32.lib;glu32.lib;glew32s.lib;%(AdditionalDependencies) ..\..\..\Externals\GLew;..\..\..\Externals\Cg;%(AdditionalLibraryDirectories) ..\..\..\Binary\$(PlatformName)\Plugins\$(TargetName)$(TargetExt) @@ -133,8 +133,8 @@ true - opengl32.lib;cg.lib;cgGL.lib;glu32.lib;glew64s.lib;%(AdditionalDependencies) - ..\..\..\Externals\GLew;..\..\..\Externals\Cg64;%(AdditionalLibraryDirectories) + opengl32.lib;glu32.lib;glew64s.lib;%(AdditionalDependencies) + ..\..\..\Externals\GLew;%(AdditionalLibraryDirectories) ..\..\..\Binary\$(PlatformName)\Plugins\$(TargetName)$(TargetExt) @@ -147,7 +147,7 @@ true true true - opengl32.lib;cg.lib;cgGL.lib;glu32.lib;glew32s.lib;%(AdditionalDependencies) + opengl32.lib;glu32.lib;glew32s.lib;%(AdditionalDependencies) ..\..\..\Externals\GLew;..\..\..\Externals\Cg;%(AdditionalLibraryDirectories) ..\..\..\Binary\$(PlatformName)\Plugins\$(TargetName)$(TargetExt) @@ -161,7 +161,7 @@ true true true - opengl32.lib;cg.lib;cgGL.lib;glu32.lib;glew32s.lib;%(AdditionalDependencies) + opengl32.lib;glu32.lib;glew32s.lib;%(AdditionalDependencies) ..\..\..\Externals\GLew;..\..\..\Externals\Cg;%(AdditionalLibraryDirectories) ..\..\..\Binary\$(PlatformName)\Plugins\$(TargetName)$(TargetExt) @@ -175,8 +175,8 @@ true true true - opengl32.lib;cg.lib;cgGL.lib;glu32.lib;glew64s.lib;%(AdditionalDependencies) - ..\..\..\Externals\GLew;..\..\..\Externals\Cg64;%(AdditionalLibraryDirectories) + opengl32.lib;glu32.lib;glew64s.lib;%(AdditionalDependencies) + ..\..\..\Externals\GLew;%(AdditionalLibraryDirectories) ..\..\..\Binary\$(PlatformName)\Plugins\$(TargetName)$(TargetExt) @@ -189,8 +189,8 @@ true true true - opengl32.lib;cg.lib;cgGL.lib;glu32.lib;glew64s.lib;%(AdditionalDependencies) - ..\..\..\Externals\GLew;..\..\..\Externals\Cg64;%(AdditionalLibraryDirectories) + opengl32.lib;glu32.lib;glew64s.lib;%(AdditionalDependencies) + ..\..\..\Externals\GLew;%(AdditionalLibraryDirectories) ..\..\..\Binary\$(PlatformName)\Plugins\$(TargetName)$(TargetExt) diff --git a/Source/VSProps/Dolphin.Win32.props b/Source/VSProps/Dolphin.Win32.props index 5850450a5a..1cddeea4e5 100644 --- a/Source/VSProps/Dolphin.Win32.props +++ b/Source/VSProps/Dolphin.Win32.props @@ -8,7 +8,7 @@ ..\..\..\Externals\SDL\$(PlatformName);..\..\..\Externals\GLew;..\..\..\Externals\Cg;..\..\..\Externals\portaudio\$(PlatformName)\$(ConfigurationName) - portaudio.lib;dsound.lib;dxerr.lib;iphlpapi.lib;winmm.lib;setupapi.lib;xinput.lib;vfw32.lib;cg.lib;cgGL.lib;opengl32.lib;glew32s.lib;glu32.lib;rpcrt4.lib;comctl32.lib;%(AdditionalDependencies) + portaudio.lib;dsound.lib;dxerr.lib;iphlpapi.lib;winmm.lib;setupapi.lib;xinput.lib;vfw32.lib;opengl32.lib;glew32s.lib;glu32.lib;rpcrt4.lib;comctl32.lib;%(AdditionalDependencies) diff --git a/Source/VSProps/Dolphin.x64.props b/Source/VSProps/Dolphin.x64.props index 754b4af53e..e225d0a7f6 100644 --- a/Source/VSProps/Dolphin.x64.props +++ b/Source/VSProps/Dolphin.x64.props @@ -8,8 +8,8 @@ - ..\..\..\Externals\SDL\$(PlatformName);..\..\..\Externals\GLew;..\..\..\Externals\Cg64;..\..\..\Externals\portaudio\$(PlatformName)\$(ConfigurationName) - portaudio.lib;dsound.lib;dxerr.lib;iphlpapi.lib;winmm.lib;setupapi.lib;xinput.lib;vfw32.lib;cg.lib;cgGL.lib;opengl32.lib;glew64s.lib;glu32.lib;rpcrt4.lib;comctl32.lib;%(AdditionalDependencies) + ..\..\..\Externals\SDL\$(PlatformName);..\..\..\Externals\GLew;..\..\..\Externals\portaudio\$(PlatformName)\$(ConfigurationName) + portaudio.lib;dsound.lib;dxerr.lib;iphlpapi.lib;winmm.lib;setupapi.lib;xinput.lib;vfw32.lib;opengl32.lib;glew64s.lib;glu32.lib;rpcrt4.lib;comctl32.lib;%(AdditionalDependencies)