Skip to content

Commit 863bd36

Browse files
livecodefraserlivecodefraser
committed
Merge branch 'develop-7.0-gyp' of https://github.com/runrev/livecode into develop-gyp
Conflicts: .gitignore Makefile docs/dictionary/function/truewordOffset.xml docs/dictionary/keyword/trueWord.xml docs/dictionary/keyword/trueWords.xml engine/Android.mk engine/engine-mobile.xcodeproj/project.pbxproj engine/engine.vcproj engine/engine.xcodeproj/project.pbxproj engine/installer.vcproj engine/kernel-server.vcproj engine/kernel-standalone.vcproj engine/kernel.vcproj engine/server.vcproj engine/src/Environment.rev engine/src/desktop.cpp engine/src/mbliphoneapp.mm engine/src/mode_development.cpp engine/src/player-platform.cpp engine/src/player-platform.h engine/src/stack.cpp engine/src/stack.h engine/standalone.vcproj ide ide-support/revsaveasiosstandalone.livecodescript libcore/Makefile libcore/libcore.vcproj libcore/libcore.xcodeproj/project.pbxproj libexternal/libexternal.xcodeproj/project.pbxproj libfoundation/Android.mk libfoundation/Makefile libfoundation/include/foundation-stdlib.h libfoundation/libfoundation-mobile.xcodeproj/project.pbxproj libfoundation/libfoundation-server.vcproj libfoundation/libfoundation.vcproj libfoundation/libfoundation.xcodeproj/project.pbxproj libgraphics/libgraphics.xcodeproj/project.pbxproj prebuilt/fetch-libraries.sh revbrowser/revbrowser.xcodeproj/project.pbxproj revdb/src/dbmysqlapi.cpp revdb/src/dbsqliteapi.cpp revdb/src/revdb.cpp revpdfprinter/src/revpdfprinter.cpp revxml/src/revxml.cpp revzip/src/revzip.cpp rules/Global Mobile.xcconfig rules/Global.xcconfig rules/application.linux.makefile rules/archive.linux.makefile rules/common.linux.makefile rules/environment.linux.makefile stage-server.sln stage.sln stage.xcodeproj/project.pbxproj thirdparty util/build_libinfo.pl util/perfect/perfect.c
2 parents f5813f8 + ead9065 commit 863bd36

File tree

367 files changed

+42765
-52684
lines changed

Some content is hidden

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

367 files changed

+42765
-52684
lines changed

‎.gitignore‎

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ extensions/*/*/*.lci
2525
extensions/*/*/*.lcm
2626
extensions/*/*/*.lce
2727

28-
# Compiled source #
28+
# Compiled source and intermediates #
2929
###################
3030
*.i
3131
*.ii
@@ -35,6 +35,10 @@ extensions/*/*/*.lce
3535
*.exe
3636
*.o
3737
*.so
38+
*.a
39+
*.pyc
40+
*.d
41+
*.stamp
3842

3943
# Packages #
4044
############
@@ -70,7 +74,7 @@ Thumbs.db
7074
####################
7175
.svn/
7276

73-
# Project setting files #
77+
# Projects and project setting files #
7478
#########################
7579
*.pbxuser
7680
*.perspectivev3
@@ -83,14 +87,24 @@ xcuserdata/
8387
*.mode1v3
8488
*.xcworkspacedata
8589
*.creator.user
86-
90+
*.Makefile
91+
*.mk
92+
*.xcodeproj/*
93+
*.pbxproj
94+
*.vcproject
95+
*.vcxproject
96+
make-*_*/
97+
vsprojects/
98+
xcprojects/
8799

88100
# Build folders #
89101
#################
90102
_build/
91103
_cache/
92104
build/
93105
/_tests/
106+
*-bin/
107+
build-*/
94108

95109
# SDKs #
96110
#################

‎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)