diff options
-rw-r--r-- | build_files/scons/tools/Blender.py | 6 | ||||
-rw-r--r-- | release/darwin/blender.app/Contents/Info.plist (renamed from source/darwin/blender.app/Contents/Info.plist) | 0 | ||||
-rw-r--r-- | release/darwin/blender.app/Contents/MacOS/blender (renamed from source/darwin/blender.app/Contents/MacOS/blender) | 0 | ||||
-rw-r--r-- | release/darwin/blender.app/Contents/PkgInfo (renamed from source/darwin/blender.app/Contents/PkgInfo) | 0 | ||||
-rw-r--r-- | release/darwin/blender.app/Contents/Resources/blender file icon.icns (renamed from source/darwin/blender.app/Contents/Resources/blender file icon.icns) | bin | 145836 -> 145836 bytes | |||
-rw-r--r-- | release/darwin/blender.app/Contents/Resources/blender icon.icns (renamed from source/darwin/blender.app/Contents/Resources/blender icon.icns) | bin | 189097 -> 189097 bytes | |||
-rw-r--r-- | release/darwin/blenderplayer.app/Contents/Info.plist (renamed from source/darwin/blenderplayer.app/Contents/Info.plist) | 0 | ||||
-rw-r--r-- | release/darwin/blenderplayer.app/Contents/MacOS/blenderplayer (renamed from source/darwin/blenderplayer.app/Contents/MacOS/blenderplayer) | 0 | ||||
-rw-r--r-- | release/darwin/blenderplayer.app/Contents/PkgInfo (renamed from source/darwin/blenderplayer.app/Contents/PkgInfo) | 0 | ||||
-rw-r--r-- | release/darwin/blenderplayer.app/Contents/Resources/blender file icon.icns (renamed from source/darwin/blenderplayer.app/Contents/Resources/blender file icon.icns) | bin | 145836 -> 145836 bytes | |||
-rw-r--r-- | release/darwin/blenderplayer.app/Contents/Resources/blender player icon.icns (renamed from source/darwin/blenderplayer.app/Contents/Resources/blender player icon.icns) | bin | 189097 -> 189097 bytes | |||
-rw-r--r-- | release/darwin/set_simulation_threads.app/Contents/Info.plist (renamed from source/darwin/set_simulation_threads.app/Contents/Info.plist) | 0 | ||||
-rwxr-xr-x | release/darwin/set_simulation_threads.app/Contents/MacOS/applet (renamed from source/darwin/set_simulation_threads.app/Contents/MacOS/applet) | bin | 34480 -> 34480 bytes | |||
-rw-r--r-- | release/darwin/set_simulation_threads.app/Contents/PkgInfo (renamed from source/darwin/set_simulation_threads.app/Contents/PkgInfo) | 0 | ||||
-rw-r--r-- | release/darwin/set_simulation_threads.app/Contents/Resources/Scripts/main.scpt (renamed from source/darwin/set_simulation_threads.app/Contents/Resources/Scripts/main.scpt) | bin | 7664 -> 7664 bytes | |||
-rw-r--r-- | release/darwin/set_simulation_threads.app/Contents/Resources/applet.icns (renamed from source/darwin/set_simulation_threads.app/Contents/Resources/applet.icns) | bin | 40291 -> 40291 bytes | |||
-rw-r--r-- | release/darwin/set_simulation_threads.app/Contents/Resources/applet.rsrc (renamed from source/darwin/set_simulation_threads.app/Contents/Resources/applet.rsrc) | bin | 362 -> 362 bytes | |||
-rw-r--r-- | release/darwin/set_simulation_threads.app/Contents/Resources/description.rtfd/TXT.rtf (renamed from source/darwin/set_simulation_threads.app/Contents/Resources/description.rtfd/TXT.rtf) | 0 | ||||
-rw-r--r-- | source/blenderplayer/CMakeLists.txt | 2 | ||||
-rw-r--r-- | source/creator/CMakeLists.txt | 4 |
20 files changed, 6 insertions, 6 deletions
diff --git a/build_files/scons/tools/Blender.py b/build_files/scons/tools/Blender.py index 27e8feaea80..7aa2a293ae6 100644 --- a/build_files/scons/tools/Blender.py +++ b/build_files/scons/tools/Blender.py @@ -596,8 +596,8 @@ def AppIt(target=None, source=None, env=None): bldroot = env.Dir('.').abspath binary = env['BINARYKIND'] - sourcedir = bldroot + '/source/darwin/%s.app'%binary - sourceinfo = bldroot + "/source/darwin/%s.app/Contents/Info.plist"%binary + sourcedir = bldroot + '/release/darwin/%s.app' % binary + sourceinfo = bldroot + "/release/darwin/%s.app/Contents/Info.plist"%binary targetinfo = installdir +'/' + "%s.app/Contents/Info.plist"%binary cmd = installdir + '/' +'%s.app'%binary @@ -686,7 +686,7 @@ def AppIt(target=None, source=None, env=None): commands.getoutput(cmd) cmd = 'rm -rf %s/set_simulation_threads.app'%(installdir) # first clear omp_num_threads applescript commands.getoutput(cmd) - cmd = 'cp -R %s/source/darwin/set_simulation_threads.app %s/'%(bldroot, installdir) # copy the omp_num_threads applescript + cmd = 'cp -R %s/release/darwin/set_simulation_threads.app %s/'%(bldroot, installdir) # copy the omp_num_threads applescript commands.getoutput(cmd) # extract copy system python, be sure to update other build systems diff --git a/source/darwin/blender.app/Contents/Info.plist b/release/darwin/blender.app/Contents/Info.plist index 064ffe5bc3f..064ffe5bc3f 100644 --- a/source/darwin/blender.app/Contents/Info.plist +++ b/release/darwin/blender.app/Contents/Info.plist diff --git a/source/darwin/blender.app/Contents/MacOS/blender b/release/darwin/blender.app/Contents/MacOS/blender index 5e05e74a307..5e05e74a307 100644 --- a/source/darwin/blender.app/Contents/MacOS/blender +++ b/release/darwin/blender.app/Contents/MacOS/blender diff --git a/source/darwin/blender.app/Contents/PkgInfo b/release/darwin/blender.app/Contents/PkgInfo index bd04210fb49..bd04210fb49 100644 --- a/source/darwin/blender.app/Contents/PkgInfo +++ b/release/darwin/blender.app/Contents/PkgInfo diff --git a/source/darwin/blender.app/Contents/Resources/blender file icon.icns b/release/darwin/blender.app/Contents/Resources/blender file icon.icns Binary files differindex 9065f1b359c..9065f1b359c 100644 --- a/source/darwin/blender.app/Contents/Resources/blender file icon.icns +++ b/release/darwin/blender.app/Contents/Resources/blender file icon.icns diff --git a/source/darwin/blender.app/Contents/Resources/blender icon.icns b/release/darwin/blender.app/Contents/Resources/blender icon.icns Binary files differindex 5eef94afde9..5eef94afde9 100644 --- a/source/darwin/blender.app/Contents/Resources/blender icon.icns +++ b/release/darwin/blender.app/Contents/Resources/blender icon.icns diff --git a/source/darwin/blenderplayer.app/Contents/Info.plist b/release/darwin/blenderplayer.app/Contents/Info.plist index c7b9ceb568e..c7b9ceb568e 100644 --- a/source/darwin/blenderplayer.app/Contents/Info.plist +++ b/release/darwin/blenderplayer.app/Contents/Info.plist diff --git a/source/darwin/blenderplayer.app/Contents/MacOS/blenderplayer b/release/darwin/blenderplayer.app/Contents/MacOS/blenderplayer index 5e05e74a307..5e05e74a307 100644 --- a/source/darwin/blenderplayer.app/Contents/MacOS/blenderplayer +++ b/release/darwin/blenderplayer.app/Contents/MacOS/blenderplayer diff --git a/source/darwin/blenderplayer.app/Contents/PkgInfo b/release/darwin/blenderplayer.app/Contents/PkgInfo index bd04210fb49..bd04210fb49 100644 --- a/source/darwin/blenderplayer.app/Contents/PkgInfo +++ b/release/darwin/blenderplayer.app/Contents/PkgInfo diff --git a/source/darwin/blenderplayer.app/Contents/Resources/blender file icon.icns b/release/darwin/blenderplayer.app/Contents/Resources/blender file icon.icns Binary files differindex 9065f1b359c..9065f1b359c 100644 --- a/source/darwin/blenderplayer.app/Contents/Resources/blender file icon.icns +++ b/release/darwin/blenderplayer.app/Contents/Resources/blender file icon.icns diff --git a/source/darwin/blenderplayer.app/Contents/Resources/blender player icon.icns b/release/darwin/blenderplayer.app/Contents/Resources/blender player icon.icns Binary files differindex 5eef94afde9..5eef94afde9 100644 --- a/source/darwin/blenderplayer.app/Contents/Resources/blender player icon.icns +++ b/release/darwin/blenderplayer.app/Contents/Resources/blender player icon.icns diff --git a/source/darwin/set_simulation_threads.app/Contents/Info.plist b/release/darwin/set_simulation_threads.app/Contents/Info.plist index eb80955e5a6..eb80955e5a6 100644 --- a/source/darwin/set_simulation_threads.app/Contents/Info.plist +++ b/release/darwin/set_simulation_threads.app/Contents/Info.plist diff --git a/source/darwin/set_simulation_threads.app/Contents/MacOS/applet b/release/darwin/set_simulation_threads.app/Contents/MacOS/applet Binary files differindex 0079f4b19d4..0079f4b19d4 100755 --- a/source/darwin/set_simulation_threads.app/Contents/MacOS/applet +++ b/release/darwin/set_simulation_threads.app/Contents/MacOS/applet diff --git a/source/darwin/set_simulation_threads.app/Contents/PkgInfo b/release/darwin/set_simulation_threads.app/Contents/PkgInfo index 3253614c402..3253614c402 100644 --- a/source/darwin/set_simulation_threads.app/Contents/PkgInfo +++ b/release/darwin/set_simulation_threads.app/Contents/PkgInfo diff --git a/source/darwin/set_simulation_threads.app/Contents/Resources/Scripts/main.scpt b/release/darwin/set_simulation_threads.app/Contents/Resources/Scripts/main.scpt Binary files differindex fa562578a80..fa562578a80 100644 --- a/source/darwin/set_simulation_threads.app/Contents/Resources/Scripts/main.scpt +++ b/release/darwin/set_simulation_threads.app/Contents/Resources/Scripts/main.scpt diff --git a/source/darwin/set_simulation_threads.app/Contents/Resources/applet.icns b/release/darwin/set_simulation_threads.app/Contents/Resources/applet.icns Binary files differindex fcc1f09273d..fcc1f09273d 100644 --- a/source/darwin/set_simulation_threads.app/Contents/Resources/applet.icns +++ b/release/darwin/set_simulation_threads.app/Contents/Resources/applet.icns diff --git a/source/darwin/set_simulation_threads.app/Contents/Resources/applet.rsrc b/release/darwin/set_simulation_threads.app/Contents/Resources/applet.rsrc Binary files differindex 540621d0b9e..540621d0b9e 100644 --- a/source/darwin/set_simulation_threads.app/Contents/Resources/applet.rsrc +++ b/release/darwin/set_simulation_threads.app/Contents/Resources/applet.rsrc diff --git a/source/darwin/set_simulation_threads.app/Contents/Resources/description.rtfd/TXT.rtf b/release/darwin/set_simulation_threads.app/Contents/Resources/description.rtfd/TXT.rtf index 0d0a60c08b5..0d0a60c08b5 100644 --- a/source/darwin/set_simulation_threads.app/Contents/Resources/description.rtfd/TXT.rtf +++ b/release/darwin/set_simulation_threads.app/Contents/Resources/description.rtfd/TXT.rtf diff --git a/source/blenderplayer/CMakeLists.txt b/source/blenderplayer/CMakeLists.txt index 11e790451cd..85bb07d6e83 100644 --- a/source/blenderplayer/CMakeLists.txt +++ b/source/blenderplayer/CMakeLists.txt @@ -60,7 +60,7 @@ elseif(APPLE) add_executable(blenderplayer ${EXETYPE} bad_level_call_stubs/stubs.c) # setup Info.plist execute_process(COMMAND date "+%Y-%m-%d" OUTPUT_VARIABLE BLENDER_DATE OUTPUT_STRIP_TRAILING_WHITESPACE) - set(PLAYER_SOURCEDIR ${CMAKE_SOURCE_DIR}/source/darwin/blenderplayer.app) + set(PLAYER_SOURCEDIR ${CMAKE_SOURCE_DIR}/release/darwin/blenderplayer.app) set(PLAYER_SOURCEINFO ${PLAYER_SOURCEDIR}/Contents/Info.plist) set_target_properties(blenderplayer PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${PLAYER_SOURCEINFO} diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index 66c3beeebad..32b990d14c5 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -656,7 +656,7 @@ elseif(APPLE) ) endmacro() - set(OSX_APP_SOURCEDIR ${CMAKE_SOURCE_DIR}/source/darwin/blender.app) + set(OSX_APP_SOURCEDIR ${CMAKE_SOURCE_DIR}/release/darwin/blender.app) # setup Info.plist execute_process(COMMAND date "+%Y-%m-%d" OUTPUT_VARIABLE BLENDER_DATE OUTPUT_STRIP_TRAILING_WHITESPACE) @@ -715,7 +715,7 @@ elseif(APPLE) # install blenderplayer bundle - copy of blender.app above. re-using macros et al # note we are using OSX Bundle as base and copying Blender dummy bundle on top of it if(WITH_GAMEENGINE AND WITH_PLAYER) - set(OSX_APP_PLAYER_SOURCEDIR ${CMAKE_SOURCE_DIR}/source/darwin/blenderplayer.app) + set(OSX_APP_PLAYER_SOURCEDIR ${CMAKE_SOURCE_DIR}/release/darwin/blenderplayer.app) set(PLAYER_SOURCEINFO ${OSX_APP_PLAYER_SOURCEDIR}/Contents/Info.plist) set(PLAYER_TARGETDIR_VER ${TARGETDIR}/blenderplayer.app/Contents/MacOS/${BLENDER_VERSION}) |