Make "make gyp" work on Windows
git-svn-id: http://skia.googlecode.com/svn/trunk@3482 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
parent
ec51cb8634
commit
52c5cbf566
5
make.py
5
make.py
@ -22,6 +22,7 @@ BUILDTYPE = 'Debug'
|
|||||||
# special targets
|
# special targets
|
||||||
TARGET_ALL = 'all'
|
TARGET_ALL = 'all'
|
||||||
TARGET_CLEAN = 'clean'
|
TARGET_CLEAN = 'clean'
|
||||||
|
TARGET_GYP = 'gyp'
|
||||||
LIST_OF_ALL_TARGETS = ['SampleApp', 'bench', 'gm', 'tests', 'tools']
|
LIST_OF_ALL_TARGETS = ['SampleApp', 'bench', 'gm', 'tests', 'tools']
|
||||||
|
|
||||||
SCRIPT_DIR = os.path.abspath(os.path.dirname(__file__))
|
SCRIPT_DIR = os.path.abspath(os.path.dirname(__file__))
|
||||||
@ -111,6 +112,10 @@ def MakeWindows(targets):
|
|||||||
mkdirs(final_output_dir)
|
mkdirs(final_output_dir)
|
||||||
|
|
||||||
for target in targets:
|
for target in targets:
|
||||||
|
# We already built the gypfiles...
|
||||||
|
if target == TARGET_GYP:
|
||||||
|
continue
|
||||||
|
|
||||||
cd(msbuild_working_dir)
|
cd(msbuild_working_dir)
|
||||||
runcommand(
|
runcommand(
|
||||||
('msbuild /nologo /property:Configuration=%s'
|
('msbuild /nologo /property:Configuration=%s'
|
||||||
|
Loading…
Reference in New Issue
Block a user