Skip to content

Commit 210b73e

Browse files
zhangJPzhangJP
zhangJP
authored and
zhangJP
committed
fix gyp build on linux
1 parent 0c07f1e commit 210b73e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

88 files changed

+7
-1
lines changed

ChangeLog

+2
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,5 @@
1616
2014-08-13:
1717
Fix crash bug for path clip.
1818

19+
2014-10-22:
20+
Fix gyp build on linux system.

autogen.sh

100644100755
File mode changed.

build_android.sh

100644100755
File mode changed.

build_proj.sh

100644100755
+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
#!/bin/sh
22

33
./tools/gyp/gyp --depth=./ picasso.gyp --generator-output=proj
4+
echo "\n"
5+
echo "Please change dir to \"proj\" and type \"make\" or \"make BUILDTYPE=Release\""

test/test.gypi

+1-1
Original file line numberDiff line numberDiff line change
@@ -578,7 +578,7 @@
578578
],
579579
'libraries': [
580580
'-lfreetype',
581-
'-lz `pkg-config --libs gtk+-2.0`',
581+
'-lz -lpthread `pkg-config --libs gtk+-2.0`',
582582
],
583583
}],
584584
],

test/thr_posix.c

+2
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@ void stop_worker_threads(void)
3636
{
3737
pthread_cancel(th1);
3838
pthread_cancel(th2);
39+
pthread_join(th1, 0);
40+
pthread_join(th2, 0);
3941
}
4042

4143
void loop_wait(int ms)

tools/cp.py

100644100755
File mode changed.

tools/gyp/PRESUBMIT.py

100644100755
File mode changed.

tools/gyp/build/lib/gyp/MSVSNew.py

100644100755
File mode changed.

tools/gyp/build/lib/gyp/MSVSProject.py

100644100755
File mode changed.

tools/gyp/build/lib/gyp/MSVSSettings.py

100644100755
File mode changed.

tools/gyp/build/lib/gyp/MSVSSettings_test.py

100644100755
File mode changed.

tools/gyp/build/lib/gyp/MSVSToolFile.py

100644100755
File mode changed.

tools/gyp/build/lib/gyp/MSVSUserFile.py

100644100755
File mode changed.

tools/gyp/build/lib/gyp/MSVSUtil.py

100644100755
File mode changed.

tools/gyp/build/lib/gyp/MSVSVersion.py

100644100755
File mode changed.

tools/gyp/build/lib/gyp/SCons.py

100644100755
File mode changed.

tools/gyp/build/lib/gyp/__init__.py

100644100755
File mode changed.

tools/gyp/build/lib/gyp/common.py

100644100755
File mode changed.

tools/gyp/build/lib/gyp/common_test.py

100644100755
File mode changed.

tools/gyp/build/lib/gyp/easy_xml.py

100644100755
File mode changed.

tools/gyp/build/lib/gyp/easy_xml_test.py

100644100755
File mode changed.

tools/gyp/build/lib/gyp/generator/__init__.py

100644100755
File mode changed.

tools/gyp/build/lib/gyp/generator/android.py

100644100755
File mode changed.

tools/gyp/build/lib/gyp/generator/dump_dependency_json.py

100644100755
File mode changed.

tools/gyp/build/lib/gyp/generator/eclipse.py

100644100755
File mode changed.

tools/gyp/build/lib/gyp/generator/gypd.py

100644100755
File mode changed.

tools/gyp/build/lib/gyp/generator/gypsh.py

100644100755
File mode changed.

tools/gyp/build/lib/gyp/generator/make.py

100644100755
File mode changed.

tools/gyp/build/lib/gyp/generator/msvs.py

100644100755
File mode changed.

tools/gyp/build/lib/gyp/generator/msvs_test.py

100644100755
File mode changed.

tools/gyp/build/lib/gyp/generator/ninja.py

100644100755
File mode changed.

tools/gyp/build/lib/gyp/generator/ninja_test.py

100644100755
File mode changed.

tools/gyp/build/lib/gyp/generator/scons.py

100644100755
File mode changed.

tools/gyp/build/lib/gyp/generator/xcode.py

100644100755
File mode changed.

tools/gyp/build/lib/gyp/input.py

100644100755
File mode changed.

tools/gyp/build/lib/gyp/mac_tool.py

100644100755
File mode changed.

tools/gyp/build/lib/gyp/msvs_emulation.py

100644100755
File mode changed.

tools/gyp/build/lib/gyp/ninja_syntax.py

100644100755
File mode changed.

tools/gyp/build/lib/gyp/sun_tool.py

100644100755
File mode changed.

tools/gyp/build/lib/gyp/win_tool.py

100644100755
File mode changed.

tools/gyp/build/lib/gyp/xcode_emulation.py

100644100755
File mode changed.

tools/gyp/build/lib/gyp/xcodeproj_file.py

100644100755
File mode changed.

tools/gyp/build/lib/gyp/xml_fix.py

100644100755
File mode changed.

tools/gyp/buildbot/buildbot_run.py

100644100755
File mode changed.

tools/gyp/gyp

100644100755
File mode changed.

tools/gyp/gyptest.py

100644100755
File mode changed.

tools/gyp/pylib/gyp/MSVSNew.py

100644100755
File mode changed.

tools/gyp/pylib/gyp/MSVSProject.py

100644100755
File mode changed.

tools/gyp/pylib/gyp/MSVSSettings.py

100644100755
File mode changed.

tools/gyp/pylib/gyp/MSVSSettings_test.py

100644100755
File mode changed.

tools/gyp/pylib/gyp/MSVSToolFile.py

100644100755
File mode changed.

tools/gyp/pylib/gyp/MSVSUserFile.py

100644100755
File mode changed.

tools/gyp/pylib/gyp/MSVSUtil.py

100644100755
File mode changed.

tools/gyp/pylib/gyp/MSVSVersion.py

100644100755
File mode changed.

tools/gyp/pylib/gyp/SCons.py

100644100755
File mode changed.

tools/gyp/pylib/gyp/__init__.py

100644100755
File mode changed.

tools/gyp/pylib/gyp/common.py

100644100755
File mode changed.

tools/gyp/pylib/gyp/common_test.py

100644100755
File mode changed.

tools/gyp/pylib/gyp/easy_xml.py

100644100755
File mode changed.

tools/gyp/pylib/gyp/easy_xml_test.py

100644100755
File mode changed.

tools/gyp/pylib/gyp/generator/__init__.py

100644100755
File mode changed.

tools/gyp/pylib/gyp/generator/android.py

100644100755
File mode changed.

tools/gyp/pylib/gyp/generator/dump_dependency_json.py

100644100755
File mode changed.

tools/gyp/pylib/gyp/generator/eclipse.py

100644100755
File mode changed.

tools/gyp/pylib/gyp/generator/gypd.py

100644100755
File mode changed.

tools/gyp/pylib/gyp/generator/gypsh.py

100644100755
File mode changed.

tools/gyp/pylib/gyp/generator/make.py

100644100755
File mode changed.

tools/gyp/pylib/gyp/generator/msvs.py

100644100755
File mode changed.

tools/gyp/pylib/gyp/generator/msvs_test.py

100644100755
File mode changed.

tools/gyp/pylib/gyp/generator/ninja.py

100644100755
File mode changed.

tools/gyp/pylib/gyp/generator/ninja_test.py

100644100755
File mode changed.

tools/gyp/pylib/gyp/generator/scons.py

100644100755
File mode changed.

tools/gyp/pylib/gyp/generator/xcode.py

100644100755
File mode changed.

tools/gyp/pylib/gyp/input.py

100644100755
File mode changed.

tools/gyp/pylib/gyp/mac_tool.py

100644100755
File mode changed.

tools/gyp/pylib/gyp/msvs_emulation.py

100644100755
File mode changed.

tools/gyp/pylib/gyp/ninja_syntax.py

100644100755
File mode changed.

tools/gyp/pylib/gyp/sun_tool.py

100644100755
File mode changed.

tools/gyp/pylib/gyp/win_tool.py

100644100755
File mode changed.

tools/gyp/pylib/gyp/xcode_emulation.py

100644100755
File mode changed.

tools/gyp/pylib/gyp/xcodeproj_file.py

100644100755
File mode changed.

tools/gyp/pylib/gyp/xml_fix.py

100644100755
File mode changed.

tools/gyp/setup.py

100644100755
File mode changed.

tools/gyp/tools/graphviz.py

100644100755
File mode changed.

tools/gyp/tools/pretty_gyp.py

100644100755
File mode changed.

tools/gyp/tools/pretty_sln.py

100644100755
File mode changed.

tools/gyp/tools/pretty_vcproj.py

100644100755
File mode changed.

0 commit comments

Comments
 (0)