Skip to content

Commit b5042bf

Browse files
livecodefraserlivecodefraser
committed
Merge remote-tracking branch 'upstream/develop-6.7-gyp' into develop-7.0-gyp
Conflicts: .gitignore Application.mk Makefile engine/Android.mk engine/encode_version.rev engine/engine.vcproj engine/engine.xcodeproj/project.pbxproj engine/engine.xcodeproj/xcshareddata/xcschemes/installer.xcscheme engine/engine.xcodeproj/xcshareddata/xcschemes/server.xcscheme engine/hash_strings.rev engine/installer.vcproj engine/kernel-development.vcproj engine/kernel-server.vcproj engine/kernel.vcproj engine/server.vcproj engine/src/deploy_windows.cpp engine/src/desktop.cpp engine/src/line.cpp engine/src/lnxdc.cpp engine/src/mcutility.h engine/src/mode_development.cpp engine/src/object.cpp engine/src/opensslsocket.cpp engine/src/paragraf.cpp engine/src/player-platform.cpp engine/src/player-platform.h engine/src/srvwindows.cpp engine/src/stack.h engine/standalone-x86_64.link engine/standalone.vcproj ide ide-support/revsaveasiosstandalone.livecodescript lcidlc/lcidlc.xcodeproj/project.pbxproj libcore/libcore-mobile.xcodeproj/project.pbxproj libcore/libcore.vcproj libcore/libcore.xcodeproj/project.pbxproj libexternalv1/libexternalv1.xcodeproj/project.pbxproj libgraphics/Android.mk libgraphics/Makefile libgraphics/libgraphics-mobile.xcodeproj/project.pbxproj libgraphics/libgraphics.xcodeproj/project.pbxproj prebuilt revbrowser/revbrowser.vcproj revbrowser/revbrowser.xcodeproj/project.pbxproj revdb/dbmysql.vcproj revdb/server-dbmysql.vcproj revfont/revfont.xcodeproj/project.pbxproj revpdfprinter/Makefile revpdfprinter/revpdfprinter-mobile.xcodeproj/project.pbxproj revpdfprinter/revpdfprinter.vcproj revpdfprinter/revpdfprinter.xcodeproj/project.pbxproj revspeech/revspeech.vcproj revspeech/revspeech.xcodeproj/project.pbxproj revvideograbber/revvideograbber.vcproj revvideograbber/revvideograbber.xcodeproj/project.pbxproj revxml/revxml.xcodeproj/project.pbxproj rules/Global Mobile.xcconfig rules/Global Server.vsprops rules/Global.vsprops rules/Global.xcconfig rules/GlobalEH Server.vsprops rules/GlobalEH.vsprops rules/application.linux.makefile rules/archive.linux.makefile rules/common.linux.makefile rules/environment.linux.makefile rules/library.linux.makefile stage-server.sln stage.sln stage.xcodeproj/project.pbxproj stage.xcodeproj/xcshareddata/xcschemes/all.xcscheme thirdparty tools/list_stub_symbols.lc util/build_libinfo.pl util/encode_version.pl util/hash_strings.pl util/list_stub_symbols.pl util/perfect/perfect.c
2 parents c0d853b + 6287a8c commit b5042bf

File tree

322 files changed

+40803
-41192
lines changed

Some content is hidden

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

322 files changed

+40803
-41192
lines changed

‎.gitignore‎

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ encryptedstack.h
2121
stacksecurity_encrypted.cpp
2222
util/perfect/perfect.linux-*
2323

24-
# Compiled source #
24+
# Compiled source and intermediates #
2525
###################
2626
*.i
2727
*.ii
@@ -31,6 +31,10 @@ util/perfect/perfect.linux-*
3131
*.exe
3232
*.o
3333
*.so
34+
*.a
35+
*.pyc
36+
*.d
37+
*.stamp
3438

3539
# Packages #
3640
############
@@ -66,7 +70,7 @@ Thumbs.db
6670
####################
6771
.svn/
6872

69-
# Project setting files #
73+
# Projects and project setting files #
7074
#########################
7175
*.pbxuser
7276
*.perspectivev3
@@ -79,13 +83,23 @@ xcuserdata/
7983
*.mode1v3
8084
*.xcworkspacedata
8185
*.creator.user
82-
86+
*.Makefile
87+
*.mk
88+
*.xcodeproj/*
89+
*.pbxproj
90+
*.vcproject
91+
*.vcxproject
92+
make-*_*/
93+
vsprojects/
94+
xcprojects/
8395

8496
# Build folders #
8597
#################
8698
_build/
8799
_cache/
88100
build/
101+
*-bin/
102+
build-*/
89103

90104
# SDKs #
91105
#################

‎Android.mk‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎Application.mk‎

Lines changed: 0 additions & 30 deletions
This file was deleted.

0 commit comments

Comments
 (0)