summaryrefslogtreecommitdiffstats
path: root/o3d/plugin
diff options
context:
space:
mode:
authorgspencer@google.com <gspencer@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-15 22:07:34 +0000
committergspencer@google.com <gspencer@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-15 22:07:34 +0000
commit9da35d991a087e00a5043b33714b46e97282adaf (patch)
tree972417cdb6044129cc681d7f45531406b5aea713 /o3d/plugin
parent247d30b530b4294c0f18181d9f5041a768851bb9 (diff)
downloadchromium_src-9da35d991a087e00a5043b33714b46e97282adaf.zip
chromium_src-9da35d991a087e00a5043b33714b46e97282adaf.tar.gz
chromium_src-9da35d991a087e00a5043b33714b46e97282adaf.tar.bz2
This moves the Cg libs into a library directory under the product dir,
and fixes the locations in the executable so that unit tests run correctly. Also, removes explicit references to Cg.framework from plugin and converter gyp files, since they already rely on cg_libs, and that should be sufficient. Review URL: http://codereview.chromium.org/276049 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29199 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d/plugin')
-rw-r--r--o3d/plugin/plugin.gyp2
1 files changed, 0 insertions, 2 deletions
diff --git a/o3d/plugin/plugin.gyp b/o3d/plugin/plugin.gyp
index 4c9da18..0341f97 100644
--- a/o3d/plugin/plugin.gyp
+++ b/o3d/plugin/plugin.gyp
@@ -145,7 +145,6 @@
'$(SDKROOT)/System/Library/Frameworks/QuickTime.framework',
'libbreakpad.a',
'libbreakpad_utilities.a',
- '../../third_party/cg/files/mac/Cg.framework',
'../../third_party/glew/files/lib/libMacStaticGLEW.a',
],
},
@@ -325,7 +324,6 @@
'$(SDKROOT)/System/Library/Frameworks/QuickTime.framework',
'libbreakpad.a',
'libbreakpad_utilities.a',
- '../../third_party/cg/files/mac/Cg.framework',
'../../third_party/glew/files/lib/libMacStaticGLEW.a',
],
},