diff options
| -rw-r--r-- | .appveyor.yml | 24 | ||||
| -rwxr-xr-x | misc/dist/osx_tools.app/Contents/Info.plist | 4 | ||||
| -rw-r--r-- | platform/windows/detect.py | 5 | ||||
| -rw-r--r-- | platform/x11/detect.py | 5 | ||||
| -rw-r--r-- | scene/gui/line_edit.cpp | 2 |
5 files changed, 35 insertions, 5 deletions
diff --git a/.appveyor.yml b/.appveyor.yml new file mode 100644 index 0000000000..ae3b72dbc8 --- /dev/null +++ b/.appveyor.yml @@ -0,0 +1,24 @@ +os: Visual Studio 2015 + +environment: + PYTHON: C:\Python27 + matrix: + - VS: C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat + GD_PLATFORM: windows + TOOLS: yes + TARGET: release_debug + ARCH: amd64 + +install: + - SET "PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%" + - pip install --egg scons # it will fail on AppVeyor without --egg flag + - if defined VS call "%VS%" %ARCH% # if defined - so we can also use mingw + +before_build: + - echo %GD_PLATFORM% + - python --version + - scons --version + - cl.exe + +build_script: +- scons platform=%GD_PLATFORM% target=%TARGET% tools=%TOOLS% diff --git a/misc/dist/osx_tools.app/Contents/Info.plist b/misc/dist/osx_tools.app/Contents/Info.plist index 4d88e97503..5012d17c37 100755 --- a/misc/dist/osx_tools.app/Contents/Info.plist +++ b/misc/dist/osx_tools.app/Contents/Info.plist @@ -19,11 +19,11 @@ <key>CFBundlePackageType</key> <string>APPL</string> <key>CFBundleShortVersionString</key> - <string>2.2-dev</string> + <string>3.0-dev</string> <key>CFBundleSignature</key> <string>godot</string> <key>CFBundleVersion</key> - <string>2.2-dev</string> + <string>3.0-dev</string> <key>NSHumanReadableCopyright</key> <string>© 2007-2017 Juan Linietsky, Ariel Manzur</string> <key>LSMinimumSystemVersion</key> diff --git a/platform/windows/detect.py b/platform/windows/detect.py index 92f2e078c8..031b397988 100644 --- a/platform/windows/detect.py +++ b/platform/windows/detect.py @@ -265,7 +265,10 @@ def configure(env): if env['use_lto']: env.Append(CCFLAGS=['-flto']) - env.Append(LINKFLAGS=['-flto']) + if not env['use_llvm'] and env.GetOption("num_jobs") > 1: + env.Append(LINKFLAGS=['-flto=' + str(env.GetOption("num_jobs"))]) + else: + env.Append(LINKFLAGS=['-flto']) ## Compile flags diff --git a/platform/x11/detect.py b/platform/x11/detect.py index c8d9930af1..1f7f67fe10 100644 --- a/platform/x11/detect.py +++ b/platform/x11/detect.py @@ -120,7 +120,10 @@ def configure(env): if env['use_lto']: env.Append(CCFLAGS=['-flto']) - env.Append(LINKFLAGS=['-flto']) + if not env['use_llvm'] and env.GetOption("num_jobs") > 1: + env.Append(LINKFLAGS=['-flto=' + str(env.GetOption("num_jobs"))]) + else: + env.Append(LINKFLAGS=['-flto']) if not env['use_llvm']: env['RANLIB'] = 'gcc-ranlib' env['AR'] = 'gcc-ar' diff --git a/scene/gui/line_edit.cpp b/scene/gui/line_edit.cpp index aa5ae089bf..8ca487f2bd 100644 --- a/scene/gui/line_edit.cpp +++ b/scene/gui/line_edit.cpp @@ -534,7 +534,7 @@ void LineEdit::_notification(int p_what) { switch (p_what) { #ifdef TOOLS_ENABLED case NOTIFICATION_ENTER_TREE: { - if (!get_tree()->is_node_being_edited(this)) { + if (Engine::get_singleton()->is_editor_hint() && !get_tree()->is_node_being_edited(this)) { cursor_set_blink_enabled(EDITOR_DEF("text_editor/cursor/caret_blink", false)); cursor_set_blink_speed(EDITOR_DEF("text_editor/cursor/caret_blink_speed", 0.65)); |