From 1b8d044543d81bd9262168f1eeecffdf95770cb2 Mon Sep 17 00:00:00 2001 From: degasus Date: Wed, 27 Feb 2013 10:55:25 +0100 Subject: [PATCH] clear cg from project files --- Source/Core/DolphinWX/CMakeLists.txt | 8 ---- Source/Core/DolphinWX/Dolphin.vcxproj | 3 -- .../Plugin_VideoOGL/Plugin_VideoOGL.vcxproj | 6 +-- Source/TestSuite/d.supp | 39 ------------------- Source/VSProps/Dolphin.Win32.props | 2 +- 5 files changed, 4 insertions(+), 54 deletions(-) diff --git a/Source/Core/DolphinWX/CMakeLists.txt b/Source/Core/DolphinWX/CMakeLists.txt index ce31c22f3e..bac11a95f3 100644 --- a/Source/Core/DolphinWX/CMakeLists.txt +++ b/Source/Core/DolphinWX/CMakeLists.txt @@ -155,14 +155,6 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist.in ) - # Install Cg framework into application bundle. - copy_resolved_framework_into_bundle( - # Our framework in "Externals" does not have "Versions/Current/" in - # its path; work around the missing directory levels using "././". - "${CMAKE_SOURCE_DIR}/Externals/Cg/Cg.framework/././Cg" - "${BUNDLE_PATH}/Contents/Frameworks/Cg.framework/././Cg" - ) - # Fix up the bundle after it is finished. # There does not seem to be an easy way to run CMake commands post-build, # so we invoke CMake again on a generated script. diff --git a/Source/Core/DolphinWX/Dolphin.vcxproj b/Source/Core/DolphinWX/Dolphin.vcxproj index b2fd930bc3..fe0b1dcd2b 100644 --- a/Source/Core/DolphinWX/Dolphin.vcxproj +++ b/Source/Core/DolphinWX/Dolphin.vcxproj @@ -136,7 +136,6 @@ xcopy "$(SolutionDir)..\Data" "$(TargetDir)" /e /s /y /d echo Copying External .dlls -xcopy "$(SolutionDir)..\Externals\Cg\*.dll" "$(TargetDir)" /e /s /y /q /d xcopy "$(SolutionDir)..\Externals\OpenAL\Win32\*.dll" "$(TargetDir)" /e /s /y /q /d xcopy "$(SolutionDir)..\Externals\SDL\$(PlatformName)\*.dll" "$(TargetDir)" /e /s /y /q /d @@ -167,7 +166,6 @@ xcopy "$(SolutionDir)..\Externals\SDL\$(PlatformName)\*.dll" "$(TargetDir)" /e / xcopy "$(SolutionDir)..\Data" "$(TargetDir)" /e /s /y /d echo Copying External .dlls -xcopy "$(SolutionDir)..\Externals\Cg\*.dll" "$(TargetDir)" /e /s /y /q /d xcopy "$(SolutionDir)..\Externals\OpenAL\Win32\*.dll" "$(TargetDir)" /e /s /y /q /d xcopy "$(SolutionDir)..\Externals\SDL\$(PlatformName)\*.dll" "$(TargetDir)" /e /s /y /q /d @@ -182,7 +180,6 @@ xcopy "$(SolutionDir)..\Externals\SDL\$(PlatformName)\*.dll" "$(TargetDir)" /e / xcopy "$(SolutionDir)..\Data" "$(TargetDir)" /e /s /y /d echo Copying External .dlls -xcopy "$(SolutionDir)..\Externals\Cg\*.dll" "$(TargetDir)" /e /s /y /q /d xcopy "$(SolutionDir)..\Externals\OpenAL\Win32\*.dll" "$(TargetDir)" /e /s /y /q /d xcopy "$(SolutionDir)..\Externals\SDL\$(PlatformName)\*.dll" "$(TargetDir)" /e /s /y /q /d diff --git a/Source/Plugins/Plugin_VideoOGL/Plugin_VideoOGL.vcxproj b/Source/Plugins/Plugin_VideoOGL/Plugin_VideoOGL.vcxproj index e1ede098cd..dadfb18b61 100644 --- a/Source/Plugins/Plugin_VideoOGL/Plugin_VideoOGL.vcxproj +++ b/Source/Plugins/Plugin_VideoOGL/Plugin_VideoOGL.vcxproj @@ -122,7 +122,7 @@ true opengl32.lib;glu32.lib;glew32s.lib;%(AdditionalDependencies) - ..\..\..\Externals\GLew;..\..\..\Externals\Cg;%(AdditionalLibraryDirectories) + ..\..\..\Externals\GLew;%(AdditionalLibraryDirectories) ..\..\..\Binary\$(PlatformName)\Plugins\$(TargetName)$(TargetExt) @@ -148,7 +148,7 @@ true true opengl32.lib;glu32.lib;glew32s.lib;%(AdditionalDependencies) - ..\..\..\Externals\GLew;..\..\..\Externals\Cg;%(AdditionalLibraryDirectories) + ..\..\..\Externals\GLew;%(AdditionalLibraryDirectories) ..\..\..\Binary\$(PlatformName)\Plugins\$(TargetName)$(TargetExt) @@ -162,7 +162,7 @@ true true opengl32.lib;glu32.lib;glew32s.lib;%(AdditionalDependencies) - ..\..\..\Externals\GLew;..\..\..\Externals\Cg;%(AdditionalLibraryDirectories) + ..\..\..\Externals\GLew;%(AdditionalLibraryDirectories) ..\..\..\Binary\$(PlatformName)\Plugins\$(TargetName)$(TargetExt) diff --git a/Source/TestSuite/d.supp b/Source/TestSuite/d.supp index 7580b904f9..ce6909e7ca 100644 --- a/Source/TestSuite/d.supp +++ b/Source/TestSuite/d.supp @@ -102,22 +102,6 @@ obj:/usr/lib/libasound.so.2.0.0 fun:snd_pcm_open_named_slave } -{ - - Memcheck:Cond - obj:/usr/lib/libCg.so - obj:/usr/lib/libCg.so - obj:/usr/lib/libCg.so - obj:/usr/lib/libCg.so - obj:/usr/lib/libCg.so - obj:/usr/lib/libCg.so - obj:/usr/lib/libCg.so - obj:/usr/lib/libCg.so - obj:/usr/lib/libCg.so - obj:/usr/lib/libCg.so - obj:/usr/lib/libCg.so - fun:cgCreateProgram -} { Memcheck:Cond @@ -149,27 +133,4 @@ obj:/usr/lib/libasound.so.2.0.0 obj:* } -{ - - Memcheck:Cond - obj:/usr/lib/libCg.so - obj:/usr/lib/libCg.so - obj:/usr/lib/libCg.so - obj:/usr/lib/libCg.so - obj:/usr/lib/libCg.so - obj:/usr/lib/libCg.so - obj:/usr/lib/libCg.so - obj:/usr/lib/libCg.so - obj:/usr/lib/libCg.so - obj:/usr/lib/libCg.so - fun:cgCreateProgram - fun:_ZN15PixelShaderMngr18CompilePixelShaderER14FRAGMENTSHADERPKc -} -{ - - Memcheck:Cond - obj:/usr/lib/libCg.so - obj:/usr/lib/libCg.so - obj:* -} diff --git a/Source/VSProps/Dolphin.Win32.props b/Source/VSProps/Dolphin.Win32.props index 1cddeea4e5..a82093460e 100644 --- a/Source/VSProps/Dolphin.Win32.props +++ b/Source/VSProps/Dolphin.Win32.props @@ -7,7 +7,7 @@ - ..\..\..\Externals\SDL\$(PlatformName);..\..\..\Externals\GLew;..\..\..\Externals\Cg;..\..\..\Externals\portaudio\$(PlatformName)\$(ConfigurationName) + ..\..\..\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;glew32s.lib;glu32.lib;rpcrt4.lib;comctl32.lib;%(AdditionalDependencies)