aboutsummaryrefslogtreecommitdiffhomepage
path: root/make.py
diff options
context:
space:
mode:
authorGravatar epoger@google.com <epoger@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2012-03-23 18:14:25 +0000
committerGravatar epoger@google.com <epoger@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2012-03-23 18:14:25 +0000
commit52c5cbf56621c34b508765e32c137c044eff4940 (patch)
treee066a2e187b3b1d41b72a369e27379823977f342 /make.py
parentec51cb863409e238b40c5beef458669d9a824481 (diff)
Make "make gyp" work on Windows
git-svn-id: http://skia.googlecode.com/svn/trunk@3482 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'make.py')
-rw-r--r--make.py5
1 files changed, 5 insertions, 0 deletions
diff --git a/make.py b/make.py
index a4081a205b..1e0b7e71b5 100644
--- a/make.py
+++ b/make.py
@@ -22,6 +22,7 @@ BUILDTYPE = 'Debug'
# special targets
TARGET_ALL = 'all'
TARGET_CLEAN = 'clean'
+TARGET_GYP = 'gyp'
LIST_OF_ALL_TARGETS = ['SampleApp', 'bench', 'gm', 'tests', 'tools']
SCRIPT_DIR = os.path.abspath(os.path.dirname(__file__))
@@ -111,6 +112,10 @@ def MakeWindows(targets):
mkdirs(final_output_dir)
for target in targets:
+ # We already built the gypfiles...
+ if target == TARGET_GYP:
+ continue
+
cd(msbuild_working_dir)
runcommand(
('msbuild /nologo /property:Configuration=%s'