[autotools/buildsteps/depends] Update paths

28 files changed, 66 insertions, 66 deletions

diff --git a/tools/android/packaging/Makefile.in b/tools/android/packaging/Makefile.in
index 79f3b9992c..ce5c60001e 100644
--- a/tools/android/packaging/Makefile.in
+++ b/tools/android/packaging/Makefile.in
@@ -8,7 +8,7 @@ OBJS = libcurl.so \
 PLATFORM_OBJS =
 EXCLUDED_ADDONS = 
 
-CORE_SOURCE_DIR = $(shell cd $(CURDIR)/../../..; pwd)
+CMAKE_SOURCE_DIR = $(shell cd $(CURDIR)/../../..; pwd)
 COPYDIRS = system addons media
 GCC_VERSION=$(shell $(CC) -dumpversion)
 ZIP=zip
@@ -92,16 +92,16 @@ shared:
 	find `pwd`/assets/addons/skin.*/media/* -depth -not -iname "Textures.xbt" -exec rm -rf {} \;
 	cd `pwd`/assets/addons; rm -rf $(EXCLUDED_ADDONS)
 	mkdir -p assets/system/certs
-	cp $(CORE_SOURCE_DIR)/tools/depends/target/openssl/cacert.pem assets/system/certs
-	cp $(CORE_SOURCE_DIR)/privacy-policy.txt assets
+	cp $(CMAKE_SOURCE_DIR)/tools/depends/target/openssl/cacert.pem assets/system/certs
+	cp $(CMAKE_SOURCE_DIR)/privacy-policy.txt assets
 
 sharedapk: shared | xbmc/assets
 	cp -rfp assets/* ./xbmc/assets
 
 sharedobb: shared
-	rm -f $(CORE_SOURCE_DIR)/main.@APP_NAME_LC@.obb
-	$(ZIP) -9 -q -r $(CORE_SOURCE_DIR)/main.@APP_NAME_LC@.obb assets
-	@echo "$(CORE_SOURCE_DIR)/main.@APP_NAME_LC@.obb created"
+	rm -f $(CMAKE_SOURCE_DIR)/main.@APP_NAME_LC@.obb
+	$(ZIP) -9 -q -r $(CMAKE_SOURCE_DIR)/main.@APP_NAME_LC@.obb assets
+	@echo "$(CMAKE_SOURCE_DIR)/main.@APP_NAME_LC@.obb created"
 
 python: | xbmc/assets
 	mkdir -p xbmc/assets/python2.7/lib/
@@ -111,7 +111,7 @@ python: | xbmc/assets
 res:
 	mkdir -p xbmc/res xbmc/res/raw xbmc/res/values images
 	@echo "native_arch=$(CPU)" > xbmc/res/raw/xbmc.properties
-	cp -fp $(CORE_SOURCE_DIR)/media/Splash.png xbmc/res/drawable/splash.png
+	cp -fp $(CMAKE_SOURCE_DIR)/media/Splash.png xbmc/res/drawable/splash.png
 	cp -fp media/drawable-hdpi/ic_launcher.png xbmc/res/drawable-hdpi/ic_launcher.png
 	cp -fp media/drawable-ldpi/ic_launcher.png xbmc/res/drawable-ldpi/ic_launcher.png
 	cp -fp media/drawable-mdpi/ic_launcher.png xbmc/res/drawable-mdpi/ic_launcher.png
@@ -138,7 +138,7 @@ libs: $(PREFIX)/lib/@APP_NAME_LC@/lib@APP_NAME_LC@.so
 	install -p $(GDBPATH) ./xbmc/libs/$(CPU)/gdbserver
 	echo "set solib-search-path ./obj/local/$(CPU)" > ./xbmc/libs/$(CPU)/gdb.setup
 	echo "directory $(TOOLCHAIN)/sysroot/usr/include $(NDKROOT)/sources/android/native_app_glue" \
-	     "$(NDKROOT)/sources/cxx-stl/gnu-libstdc++/$(GCC_VERSION)/include $(CORE_SOURCE_DIR)  $(PREFIX)/include jni" >> ./xbmc/libs/$(CPU)/gdb.setup
+	     "$(NDKROOT)/sources/cxx-stl/gnu-libstdc++/$(GCC_VERSION)/include $(CMAKE_SOURCE_DIR)  $(PREFIX)/include jni" >> ./xbmc/libs/$(CPU)/gdb.setup
 	cp -fp xbmc/libs/$(CPU)/* xbmc/lib/$(CPU)
 
 xbmc/classes.dex: res
@@ -155,9 +155,9 @@ package: libs python xbmc/classes.dex
 apk-sign:
 	@echo "Signing..."
 	@jarsigner -sigalg MD5withRSA -digestalg SHA1 -keystore $(SIGN_STORE) -storepass $(SIGN_STOREPASS) $(SIGN_KEYPASS_OPT) images/@APP_NAME_LC@app-debug-$(CPU)-unaligned.apk $(SIGN_KEY)
-	@$(ZIPALIGN) -f 4 images/@APP_NAME_LC@app-debug-$(CPU)-unaligned.apk $(CORE_SOURCE_DIR)/@APP_NAME_LC@app-$(CPU)-debug.apk
+	@$(ZIPALIGN) -f 4 images/@APP_NAME_LC@app-debug-$(CPU)-unaligned.apk $(CMAKE_SOURCE_DIR)/@APP_NAME_LC@app-$(CPU)-debug.apk
 	@rm images/@APP_NAME_LC@app-debug-$(CPU)-unaligned.apk
-	@echo "$(CORE_SOURCE_DIR)/@APP_NAME_LC@app-$(CPU)-debug.apk created"
+	@echo "$(CMAKE_SOURCE_DIR)/@APP_NAME_LC@app-$(CPU)-debug.apk created"
 
 $(PREFIX)/lib/xbmc/lib@APP_NAME_LC@.so: $(SRCLIBS)
 	$(MAKE) -C ../../depends/target/xbmc
diff --git a/tools/buildsteps/android-arm64-v8a/make-binary-addons b/tools/buildsteps/android-arm64-v8a/make-binary-addons
index 19a9d85bac..3d5e0a30f4 100644
--- a/tools/buildsteps/android-arm64-v8a/make-binary-addons
+++ b/tools/buildsteps/android-arm64-v8a/make-binary-addons
@@ -5,7 +5,7 @@ XBMC_PLATFORM_DIR=android
 . $WORKSPACE/tools/buildsteps/$XBMC_PLATFORM_DIR/make-native-depends
 
 #clear the build failed file
-rm -f $WORKSPACE/project/cmake/$FAILED_BUILD_FILENAME
+rm -f $WORKSPACE/cmake/$FAILED_BUILD_FILENAME
 
 ALL_BINARY_ADDONS_BUILT="1"
 #only build binary addons when requested by env/jenkins
@@ -24,8 +24,8 @@ fi
 
 if [ "$ALL_BINARY_ADDONS_BUILT" == "1" ]
 then
-  tagSuccessFulBuild $WORKSPACE/project/cmake
+  tagSuccessFulBuild $WORKSPACE/cmake
 else
   #mark the build failure in the filesystem but leave jenkins running
-  tagFailedBuild $WORKSPACE/project/cmake
+  tagFailedBuild $WORKSPACE/cmake
 fi
diff --git a/tools/buildsteps/android-arm64-v8a/prepare-depends b/tools/buildsteps/android-arm64-v8a/prepare-depends
index 933ea4592e..b4d02b7a2e 100644
--- a/tools/buildsteps/android-arm64-v8a/prepare-depends
+++ b/tools/buildsteps/android-arm64-v8a/prepare-depends
@@ -4,7 +4,7 @@ XBMC_PLATFORM_DIR=android
 
 #clean without depends for skipping depends build if possible
 #also skip binary addons (pvr, audioencoder) as long as they are deployed in tree
-cd $WORKSPACE;git clean -xfd -e "project/cmake/.last_success_revision" -e "tools/depends" ${DEPLOYED_BINARY_ADDONS}
+cd $WORKSPACE;git clean -xfd -e "cmake/.last_success_revision" -e "tools/depends" ${DEPLOYED_BINARY_ADDONS}
 
 # if depends path has changed - cleanout everything and do a full rebuild
 if [ "$(pathChanged $WORKSPACE/tools/depends)" == "1" ]
diff --git a/tools/buildsteps/android/make-binary-addons b/tools/buildsteps/android/make-binary-addons
index 123f55da68..76bba45ec8 100644
--- a/tools/buildsteps/android/make-binary-addons
+++ b/tools/buildsteps/android/make-binary-addons
@@ -5,7 +5,7 @@ XBMC_PLATFORM_DIR=android
 . $WORKSPACE/tools/buildsteps/$XBMC_PLATFORM_DIR/make-native-depends 
 
 #clear the build failed file
-rm -f $WORKSPACE/project/cmake/$FAILED_BUILD_FILENAME
+rm -f $WORKSPACE/cmake/$FAILED_BUILD_FILENAME
 
 ALL_BINARY_ADDONS_BUILT="1"
 #only build binary addons when requested by env/jenkins
@@ -24,8 +24,8 @@ fi
 
 if [ "$ALL_BINARY_ADDONS_BUILT" == "1" ]
 then
-  tagSuccessFulBuild $WORKSPACE/project/cmake
+  tagSuccessFulBuild $WORKSPACE/cmake
 else
   #mark the build failure in the filesystem but leave jenkins running
-  tagFailedBuild $WORKSPACE/project/cmake
+  tagFailedBuild $WORKSPACE/cmake
 fi
diff --git a/tools/buildsteps/android/prepare-depends b/tools/buildsteps/android/prepare-depends
index 933ea4592e..b4d02b7a2e 100644
--- a/tools/buildsteps/android/prepare-depends
+++ b/tools/buildsteps/android/prepare-depends
@@ -4,7 +4,7 @@ XBMC_PLATFORM_DIR=android
 
 #clean without depends for skipping depends build if possible
 #also skip binary addons (pvr, audioencoder) as long as they are deployed in tree
-cd $WORKSPACE;git clean -xfd -e "project/cmake/.last_success_revision" -e "tools/depends" ${DEPLOYED_BINARY_ADDONS}
+cd $WORKSPACE;git clean -xfd -e "cmake/.last_success_revision" -e "tools/depends" ${DEPLOYED_BINARY_ADDONS}
 
 # if depends path has changed - cleanout everything and do a full rebuild
 if [ "$(pathChanged $WORKSPACE/tools/depends)" == "1" ]
diff --git a/tools/buildsteps/androidx86/make-binary-addons b/tools/buildsteps/androidx86/make-binary-addons
index 19a9d85bac..3d5e0a30f4 100644
--- a/tools/buildsteps/androidx86/make-binary-addons
+++ b/tools/buildsteps/androidx86/make-binary-addons
@@ -5,7 +5,7 @@ XBMC_PLATFORM_DIR=android
 . $WORKSPACE/tools/buildsteps/$XBMC_PLATFORM_DIR/make-native-depends
 
 #clear the build failed file
-rm -f $WORKSPACE/project/cmake/$FAILED_BUILD_FILENAME
+rm -f $WORKSPACE/cmake/$FAILED_BUILD_FILENAME
 
 ALL_BINARY_ADDONS_BUILT="1"
 #only build binary addons when requested by env/jenkins
@@ -24,8 +24,8 @@ fi
 
 if [ "$ALL_BINARY_ADDONS_BUILT" == "1" ]
 then
-  tagSuccessFulBuild $WORKSPACE/project/cmake
+  tagSuccessFulBuild $WORKSPACE/cmake
 else
   #mark the build failure in the filesystem but leave jenkins running
-  tagFailedBuild $WORKSPACE/project/cmake
+  tagFailedBuild $WORKSPACE/cmake
 fi
diff --git a/tools/buildsteps/androidx86/prepare-depends b/tools/buildsteps/androidx86/prepare-depends
index 933ea4592e..b4d02b7a2e 100644
--- a/tools/buildsteps/androidx86/prepare-depends
+++ b/tools/buildsteps/androidx86/prepare-depends
@@ -4,7 +4,7 @@ XBMC_PLATFORM_DIR=android
 
 #clean without depends for skipping depends build if possible
 #also skip binary addons (pvr, audioencoder) as long as they are deployed in tree
-cd $WORKSPACE;git clean -xfd -e "project/cmake/.last_success_revision" -e "tools/depends" ${DEPLOYED_BINARY_ADDONS}
+cd $WORKSPACE;git clean -xfd -e "cmake/.last_success_revision" -e "tools/depends" ${DEPLOYED_BINARY_ADDONS}
 
 # if depends path has changed - cleanout everything and do a full rebuild
 if [ "$(pathChanged $WORKSPACE/tools/depends)" == "1" ]
diff --git a/tools/buildsteps/ios/make-binary-addons b/tools/buildsteps/ios/make-binary-addons
index c0651fc413..3f5bd0299b 100755
--- a/tools/buildsteps/ios/make-binary-addons
+++ b/tools/buildsteps/ios/make-binary-addons
@@ -5,7 +5,7 @@ XBMC_PLATFORM_DIR=ios
 . $WORKSPACE/tools/buildsteps/$XBMC_PLATFORM_DIR/make-native-depends
 
 #clear the build failed file
-rm -f $WORKSPACE/project/cmake/$FAILED_BUILD_FILENAME
+rm -f $WORKSPACE/cmake/$FAILED_BUILD_FILENAME
 
 ALL_BINARY_ADDONS_BUILT="1"
 #only build binary addons when requested by env/jenkins
@@ -23,8 +23,8 @@ fi
 
 if [ "$ALL_BINARY_ADDONS_BUILT" == "1" ]
 then
-  tagSuccessFulBuild $WORKSPACE/project/cmake
+  tagSuccessFulBuild $WORKSPACE/cmake
 else
   #mark the build failure in the filesystem but leave jenkins running
-  tagFailedBuild $WORKSPACE/project/cmake
+  tagFailedBuild $WORKSPACE/cmake
 fi
diff --git a/tools/buildsteps/ios/prepare-depends b/tools/buildsteps/ios/prepare-depends
index 01aa9ed766..3b6a893605 100755
--- a/tools/buildsteps/ios/prepare-depends
+++ b/tools/buildsteps/ios/prepare-depends
@@ -4,7 +4,7 @@ XBMC_PLATFORM_DIR=ios
 
 #clean without depends for skipping depends build if possible
 #also skip binary addons (pvr, audioencoder) as long as they are deployed in tree
-cd $WORKSPACE;git clean -xfd -e "project/cmake/.last_success_revision" -e "tools/depends" ${DEPLOYED_BINARY_ADDONS}
+cd $WORKSPACE;git clean -xfd -e "cmake/.last_success_revision" -e "tools/depends" ${DEPLOYED_BINARY_ADDONS}
 
 # if depends path has changed - cleanout everything and do a full rebuild
 if [ "$(pathChanged $WORKSPACE/tools/depends)" == "1" ]
diff --git a/tools/buildsteps/linux64/make-binary-addons b/tools/buildsteps/linux64/make-binary-addons
index beda7297f0..5c58675ee7 100755
--- a/tools/buildsteps/linux64/make-binary-addons
+++ b/tools/buildsteps/linux64/make-binary-addons
@@ -5,7 +5,7 @@ XBMC_PLATFORM_DIR=linux64
 . $WORKSPACE/tools/buildsteps/$XBMC_PLATFORM_DIR/make-native-depends
 
 #clear the build failed file
-rm -f $WORKSPACE/project/cmake/$FAILED_BUILD_FILENAME
+rm -f $WORKSPACE/cmake/$FAILED_BUILD_FILENAME
 
 ALL_BINARY_ADDONS_BUILT="1"
 #only build binary addons when requested by env/jenkins
@@ -21,8 +21,8 @@ fi
 
 if [ "$ALL_BINARY_ADDONS_BUILT" == "1" ]
 then
-  tagSuccessFulBuild $WORKSPACE/project/cmake
+  tagSuccessFulBuild $WORKSPACE/cmake
 else
   #mark the build failure in the filesystem but leave jenkins running
-  tagFailedBuild $WORKSPACE/project/cmake
+  tagFailedBuild $WORKSPACE/cmake
 fi
diff --git a/tools/buildsteps/linux64/prepare-depends b/tools/buildsteps/linux64/prepare-depends
index ae0a027a06..6064a17f79 100755
--- a/tools/buildsteps/linux64/prepare-depends
+++ b/tools/buildsteps/linux64/prepare-depends
@@ -4,7 +4,7 @@ XBMC_PLATFORM_DIR=linux64
 
 #clean without depends for skipping depends build if possible
 #also skip binary addons (pvr, audioencoder) as long as they are deployed in tree
-cd $WORKSPACE;git clean -xfd -e "project/cmake/.last_success_revision" -e "tools/depends" ${DEPLOYED_BINARY_ADDONS}
+cd $WORKSPACE;git clean -xfd -e "cmake/.last_success_revision" -e "tools/depends" ${DEPLOYED_BINARY_ADDONS}
 
 # if depends path has changed - cleanout everything and do a full rebuild
 if [ "$(pathChanged $WORKSPACE/tools/depends)" == "1" ]
diff --git a/tools/buildsteps/osx64/make-binary-addons b/tools/buildsteps/osx64/make-binary-addons
index c12a42ac20..fd0bd7a66e 100755
--- a/tools/buildsteps/osx64/make-binary-addons
+++ b/tools/buildsteps/osx64/make-binary-addons
@@ -5,7 +5,7 @@ XBMC_PLATFORM_DIR=osx64
 . $WORKSPACE/tools/buildsteps/$XBMC_PLATFORM_DIR/make-native-depends
 
 #clear the build failed file
-rm -f $WORKSPACE/project/cmake/$FAILED_BUILD_FILENAME
+rm -f $WORKSPACE/cmake/$FAILED_BUILD_FILENAME
 
 ALL_BINARY_ADDONS_BUILT="1"
 #only build binary addons when requested by env/jenkins
@@ -23,8 +23,8 @@ fi
 
 if [ "$ALL_BINARY_ADDONS_BUILT" == "1" ]
 then
-  tagSuccessFulBuild $WORKSPACE/project/cmake
+  tagSuccessFulBuild $WORKSPACE/cmake
 else
   #mark the build failure in the filesystem but leave jenkins running
-  tagFailedBuild $WORKSPACE/project/cmake
+  tagFailedBuild $WORKSPACE/cmake
 fi
diff --git a/tools/buildsteps/osx64/prepare-depends b/tools/buildsteps/osx64/prepare-depends
index 60df95379d..8aba95ec02 100755
--- a/tools/buildsteps/osx64/prepare-depends
+++ b/tools/buildsteps/osx64/prepare-depends
@@ -4,7 +4,7 @@ XBMC_PLATFORM_DIR=osx64
 
 #clean without depends for skipping depends build if possible
 #also skip binary addons (pvr, audioencoder) as long as they are deployed in tree
-cd $WORKSPACE;git clean -xfd -e "project/cmake/.last_success_revision" -e "tools/depends" ${DEPLOYED_BINARY_ADDONS}
+cd $WORKSPACE;git clean -xfd -e "cmake/.last_success_revision" -e "tools/depends" ${DEPLOYED_BINARY_ADDONS}
 
 # if depends path has changed - cleanout everything and do a full rebuild
 if [ "$(pathChanged $WORKSPACE/tools/depends)" == "1" ]
diff --git a/tools/buildsteps/rbpi/make-binary-addons b/tools/buildsteps/rbpi/make-binary-addons
index d55f79aba1..862e7d79e9 100755
--- a/tools/buildsteps/rbpi/make-binary-addons
+++ b/tools/buildsteps/rbpi/make-binary-addons
@@ -5,7 +5,7 @@ XBMC_PLATFORM_DIR=rbpi
 . $WORKSPACE/tools/buildsteps/$XBMC_PLATFORM_DIR/make-native-depends
 
 #clear the build failed file
-rm -f $WORKSPACE/project/cmake/$FAILED_BUILD_FILENAME
+rm -f $WORKSPACE/cmake/$FAILED_BUILD_FILENAME
 
 ALL_BINARY_ADDONS_BUILT="1"
 #only build binary addons when requested by env/jenkins
@@ -21,8 +21,8 @@ fi
 
 if [ "$ALL_BINARY_ADDONS_BUILT" == "1" ]
 then
-  tagSuccessFulBuild $WORKSPACE/project/cmake
+  tagSuccessFulBuild $WORKSPACE/cmake
 else
   #mark the build failure in the filesystem but leave jenkins running
-  tagFailedBuild $WORKSPACE/project/cmake
+  tagFailedBuild $WORKSPACE/cmake
 fi
diff --git a/tools/buildsteps/rbpi/prepare-depends b/tools/buildsteps/rbpi/prepare-depends
index 8205432d65..c38eb77901 100755
--- a/tools/buildsteps/rbpi/prepare-depends
+++ b/tools/buildsteps/rbpi/prepare-depends
@@ -4,7 +4,7 @@ XBMC_PLATFORM_DIR=rbpi
 
 #clean without depends for skipping depends build if possible
 #also skip binary addons (pvr, audioencoder) as long as they are deployed in tree
-cd $WORKSPACE;git clean -xfd -e "project/cmake/.last_success_revision" -e "tools/depends" ${DEPLOYED_BINARY_ADDONS}
+cd $WORKSPACE;git clean -xfd -e "cmake/.last_success_revision" -e "tools/depends" ${DEPLOYED_BINARY_ADDONS}
 
 if [ -d $JENKINS_RBPI_DEVENV/firmware ]
 then
diff --git a/tools/buildsteps/win32/bootstrap-addons.bat b/tools/buildsteps/win32/bootstrap-addons.bat
index 1e1d59ae3b..912c6bdc1f 100644
--- a/tools/buildsteps/win32/bootstrap-addons.bat
+++ b/tools/buildsteps/win32/bootstrap-addons.bat
@@ -33,7 +33,7 @@ IF "%WORKDIR%" == "" (
 
 rem setup some paths that we need later
 SET CUR_PATH=%CD%
-SET BASE_PATH=%WORKDIR%\project\cmake
+SET BASE_PATH=%WORKDIR%\cmake
 SET ADDONS_PATH=%BASE_PATH%\addons
 SET ADDONS_BOOTSTRAP_PATH=%ADDONS_PATH%\bootstrap
 SET BOOTSTRAP_BUILD_PATH=%ADDONS_PATH%\build\bootstrap
diff --git a/tools/buildsteps/win32/make-addons.bat b/tools/buildsteps/win32/make-addons.bat
index 04ef0de25b..6329dcae36 100644
--- a/tools/buildsteps/win32/make-addons.bat
+++ b/tools/buildsteps/win32/make-addons.bat
@@ -39,7 +39,7 @@ IF "%WORKDIR%" == "" (
 
 rem setup some paths that we need later
 SET CUR_PATH=%CD%
-SET BASE_PATH=%WORKDIR%\project\cmake
+SET BASE_PATH=%WORKDIR%\cmake
 SET SCRIPTS_PATH=%BASE_PATH%\scripts\windows
 SET ADDONS_PATH=%BASE_PATH%\addons
 SET ADDON_DEPENDS_PATH=%ADDONS_PATH%\output
@@ -108,7 +108,7 @@ cmake "%ADDONS_PATH%" -G "NMake Makefiles" ^
       -DCMAKE_USER_MAKE_RULES_OVERRIDE="%SCRIPTS_PATH%/CFlagOverrides.cmake" ^
       -DCMAKE_USER_MAKE_RULES_OVERRIDE_CXX="%SCRIPTS_PATH%/CXXFlagOverrides.cmake" ^
       -DCMAKE_INSTALL_PREFIX=%ADDONS_INSTALL_PATH% ^
-      -DCORE_SOURCE_DIR=%WORKDIR% ^
+      -DCMAKE_SOURCE_DIR=%WORKDIR% ^
       -DBUILD_DIR=%ADDONS_BUILD_PATH% ^
       -DADDON_DEPENDS_PATH=%ADDON_DEPENDS_PATH% ^
       -DPACKAGE_ZIP=ON ^
diff --git a/tools/depends/Makefile.include.in b/tools/depends/Makefile.include.in
index a714daec11..0ddd0444e3 100644
--- a/tools/depends/Makefile.include.in
+++ b/tools/depends/Makefile.include.in
@@ -4,7 +4,7 @@ DEBUG_BUILD=@use_debug@
 TOOLCHAIN=@use_toolchain@
 NDKROOT=@use_ndk@
 SDKROOT=@use_sdk_path@
-CORE_SOURCE_DIR=$(abspath $(abs_top_srcdir)/../../)
+CMAKE_SOURCE_DIR=$(abspath $(abs_top_srcdir)/../../)
 TARBALLS_LOCATION=@use_tarballs@
 PLATFORM=@deps_dir@
 HOST=@use_host@
diff --git a/tools/depends/native/TexturePacker/CMakeLists.txt b/tools/depends/native/TexturePacker/CMakeLists.txt
index de3b228aea..050ee10f07 100644
--- a/tools/depends/native/TexturePacker/CMakeLists.txt
+++ b/tools/depends/native/TexturePacker/CMakeLists.txt
@@ -33,7 +33,7 @@ set(SOURCES src/md5.cpp
             src/decoder/PNGDecoder.cpp
             src/decoder/GifHelper.cpp
             src/decoder/GIFDecoder.cpp
-            ${CORE_SOURCE_DIR}/xbmc/guilib/XBTF.cpp)
+            ${CMAKE_SOURCE_DIR}/xbmc/guilib/XBTF.cpp)
 
 set(CMAKE_POSITITION_INDEPENDENT_CODE 1)
 
@@ -42,9 +42,9 @@ target_include_directories(TexturePacker
                            PRIVATE ${PNG_INCLUDE_DIRS}
                                     ${JPEG_INCLUDE_DIR}
                                     ${GIF_INCLUDE_DIR}
-                                    ${CORE_SOURCE_DIR}/xbmc
-                                    ${CORE_SOURCE_DIR}/xbmc/${PLATFORM_DIR}
-                                    ${CORE_SOURCE_DIR}/lib
+                                    ${CMAKE_SOURCE_DIR}/xbmc
+                                    ${CMAKE_SOURCE_DIR}/xbmc/${PLATFORM_DIR}
+                                    ${CMAKE_SOURCE_DIR}/lib
                                     ${CMAKE_CURRENT_SOURCE_DIR}/src
                                     ${CMAKE_CURRENT_SOURCE_DIR}/src/decoder)
 target_link_libraries(TexturePacker
diff --git a/tools/depends/native/TexturePacker/Makefile b/tools/depends/native/TexturePacker/Makefile
index f83e031e22..d12677617f 100644
--- a/tools/depends/native/TexturePacker/Makefile
+++ b/tools/depends/native/TexturePacker/Makefile
@@ -21,8 +21,8 @@ ifeq ($(NATIVE_OS), android)
   EXTRA_CONFIGURE = --enable-static
 endif
 
-ifeq ($(CORE_SOURCE_DIR),)
-  CORE_SOURCE_DIR = $(ROOT_DIR)/../../../..
+ifeq ($(CMAKE_SOURCE_DIR),)
+  CMAKE_SOURCE_DIR = $(ROOT_DIR)/../../../..
 endif
 
 SOURCE=$(ROOT_DIR)/src
@@ -46,11 +46,11 @@ $(APP): $(PLATFORM)
 	$(MAKE) -C $(PLATFORM) install
 	touch $@
 	#TEMP workaround for skins: create legacy link. Remove me when skins are fixed
-	@mkdir -p $(CORE_SOURCE_DIR)/tools/TexturePacker
-	@[ -f $(CORE_SOURCE_DIR)/tools/TexturePacker/TexturePacker ] && rm $(CORE_SOURCE_DIR)/tools/TexturePacker/TexturePacker || :
-	@ln -sf $(APPBIN) $(CORE_SOURCE_DIR)/tools/TexturePacker/TexturePacker
-	@echo "all:" > $(CORE_SOURCE_DIR)/tools/TexturePacker/Makefile
-	@echo "\t@echo "WARNING: use of tools/TexturePacker/TexturePacker is deprecated, please update your skins Makefile"" >> $(CORE_SOURCE_DIR)/tools/TexturePacker/Makefile
+	@mkdir -p $(CMAKE_SOURCE_DIR)/tools/TexturePacker
+	@[ -f $(CMAKE_SOURCE_DIR)/tools/TexturePacker/TexturePacker ] && rm $(CMAKE_SOURCE_DIR)/tools/TexturePacker/TexturePacker || :
+	@ln -sf $(APPBIN) $(CMAKE_SOURCE_DIR)/tools/TexturePacker/TexturePacker
+	@echo "all:" > $(CMAKE_SOURCE_DIR)/tools/TexturePacker/Makefile
+	@echo "\t@echo "WARNING: use of tools/TexturePacker/TexturePacker is deprecated, please update your skins Makefile"" >> $(CMAKE_SOURCE_DIR)/tools/TexturePacker/Makefile
 
 clean:
 	$(MAKE) -C $(PLATFORM) clean
diff --git a/tools/depends/target/boblight/Makefile b/tools/depends/target/boblight/Makefile
index 43d8224adb..bf207a6255 100644
--- a/tools/depends/target/boblight/Makefile
+++ b/tools/depends/target/boblight/Makefile
@@ -51,7 +51,7 @@ endif
 ifeq ($(OS),ios)
 ifeq ($(TARGET_PLATFORM),appletvos)
 	#deploy into source tree for tvos - we distribute libboblight with the bundle...
-	cp $(PLATFORM)/src/.libs/libboblight.0.dylib $(CORE_SOURCE_DIR)/system/libboblight-tvos.0.dylib
+	cp $(PLATFORM)/src/.libs/libboblight.0.dylib $(CMAKE_SOURCE_DIR)/system/libboblight-tvos.0.dylib
 endif
 else
 	echo "libboblight isn't a dependency of XBMC and won't be installed"
diff --git a/tools/depends/target/cmakebuildsys/Makefile b/tools/depends/target/cmakebuildsys/Makefile
index 9ceaad63b6..b0ca5ed1e4 100644
--- a/tools/depends/target/cmakebuildsys/Makefile
+++ b/tools/depends/target/cmakebuildsys/Makefile
@@ -1,6 +1,6 @@
 -include ../../Makefile.include
 
-VERSION.TXT := $(CORE_SOURCE_DIR)/version.txt
+VERSION.TXT := $(CMAKE_SOURCE_DIR)/version.txt
 APP_NAME=$(shell awk '/APP_NAME/ {print tolower($$2)}' $(VERSION.TXT))
 
 ifeq ($(Configuration),)
@@ -11,11 +11,11 @@ ifeq ($(Configuration),)
 endif
 
 all:
-	mkdir -p $(CORE_SOURCE_DIR)/build
-	cd $(CORE_SOURCE_DIR)/build; $(CMAKE) -DCMAKE_BUILD_TYPE=$(Configuration) -DENABLE_INTERNAL_CROSSGUID=OFF -DENABLE_INTERNAL_FFMPEG=OFF $(CORE_SOURCE_DIR)/project/cmake
+	mkdir -p $(CMAKE_SOURCE_DIR)/build
+	cd $(CMAKE_SOURCE_DIR)/build; $(CMAKE) -DCMAKE_BUILD_TYPE=$(Configuration) -DENABLE_INTERNAL_CROSSGUID=OFF -DENABLE_INTERNAL_FFMPEG=OFF $(CMAKE_SOURCE_DIR)
 
 clean:
-	cd $(CORE_SOURCE_DIR)/build; $(MAKE) clean
+	cd $(CMAKE_SOURCE_DIR)/build; $(MAKE) clean
 
 distclean:
-	cd $(CORE_SOURCE_DIR)/build; $(MAKE) clean
+	cd $(CMAKE_SOURCE_DIR)/build; $(MAKE) clean
diff --git a/tools/depends/target/dummy-libxbmc/Makefile b/tools/depends/target/dummy-libxbmc/Makefile
index 06524c4626..9f4cbe3f7b 100644
--- a/tools/depends/target/dummy-libxbmc/Makefile
+++ b/tools/depends/target/dummy-libxbmc/Makefile
@@ -1,5 +1,5 @@
 include ../../Makefile.include
-VERSION.TXT := $(CORE_SOURCE_DIR)/version.txt
+VERSION.TXT := $(CMAKE_SOURCE_DIR)/version.txt
 DEPS= ../../Makefile.include Makefile dummy-libxbmc.c $(VERSION.TXT)
 APP_NAME=$(shell awk '/APP_NAME/ {print tolower($$2)}' $(VERSION.TXT))
 
diff --git a/tools/depends/target/pythonmodule-pil/Makefile b/tools/depends/target/pythonmodule-pil/Makefile
index 610961bec5..7fc7187848 100644
--- a/tools/depends/target/pythonmodule-pil/Makefile
+++ b/tools/depends/target/pythonmodule-pil/Makefile
@@ -1,7 +1,7 @@
 include ../../Makefile.include
 DEPS= ../../Makefile.include Makefile pillow-crosscompile.patch
 
-VERSION.TXT := $(CORE_SOURCE_DIR)/version.txt
+VERSION.TXT := $(CMAKE_SOURCE_DIR)/version.txt
 APP_NAME=$(shell awk '/APP_NAME/ {print tolower($$2)}' $(VERSION.TXT))
 
 # lib name, version
diff --git a/tools/depends/target/pythonmodule-setuptools/Makefile b/tools/depends/target/pythonmodule-setuptools/Makefile
index 60896aa5f1..f4b29d5559 100644
--- a/tools/depends/target/pythonmodule-setuptools/Makefile
+++ b/tools/depends/target/pythonmodule-setuptools/Makefile
@@ -1,7 +1,7 @@
 include ../../Makefile.include
 DEPS= ../../Makefile.include Makefile #pillow-crosscompile.patch
 
-VERSION.TXT := $(CORE_SOURCE_DIR)/version.txt
+VERSION.TXT := $(CMAKE_SOURCE_DIR)/version.txt
 APP_NAME=$(shell awk '/APP_NAME/ {print tolower($$2)}' $(VERSION.TXT))
 
 # lib name, version
diff --git a/tools/depends/target/xbmc/Makefile b/tools/depends/target/xbmc/Makefile
index b370c6d4b2..bc669f50e7 100644
--- a/tools/depends/target/xbmc/Makefile
+++ b/tools/depends/target/xbmc/Makefile
@@ -1,6 +1,6 @@
 -include ../../Makefile.include
 
-VERSION.TXT := $(CORE_SOURCE_DIR)/version.txt
+VERSION.TXT := $(CMAKE_SOURCE_DIR)/version.txt
 APP_NAME=$(shell awk '/APP_NAME/ {print tolower($$2)}' $(VERSION.TXT))
 
 SOURCE=../../../../
diff --git a/tools/depends/xbmc-addons.include b/tools/depends/xbmc-addons.include
index e234852b0e..0a14b83a02 100644
--- a/tools/depends/xbmc-addons.include
+++ b/tools/depends/xbmc-addons.include
@@ -1,6 +1,6 @@
 ADDON_DEPS_DIR := $(BUILDDIR)/$(PLATFORM)/build/depends
 TOOLCHAIN_FILE = $(ADDON_DEPS_DIR)/share/Toolchain_binaddons.cmake
-ADDON_PROJECT_DIR = $(BUILDDIR)/../../../../project/cmake/addons
+ADDON_PROJECT_DIR = $(BUILDDIR)/../../../../cmake/addons
 
 ifeq ($(CROSS_COMPILING),yes)
   DEPS = $(TOOLCHAIN_FILE) $(abs_top_srcdir)/target/config-binaddons.site $(abs_top_srcdir)/target/Toolchain_binaddons.cmake $(CONFIG_SUB) $(CONFIG_GUESS)
diff --git a/tools/windows/prepare-binary-addons-dev.bat b/tools/windows/prepare-binary-addons-dev.bat
index 93561d430e..3a7765555e 100644
--- a/tools/windows/prepare-binary-addons-dev.bat
+++ b/tools/windows/prepare-binary-addons-dev.bat
@@ -28,7 +28,7 @@ IF "%WORKDIR%" == "" (
 
 rem setup some paths that we need later
 SET CUR_PATH=%CD%
-SET BASE_PATH=%WORKDIR%\project\cmake
+SET BASE_PATH=%WORKDIR%\cmake
 SET SCRIPTS_PATH=%BASE_PATH%\scripts\windows
 SET ADDONS_PATH=%BASE_PATH%\addons
 SET ADDON_DEPENDS_PATH=%ADDONS_PATH%\output
@@ -81,7 +81,7 @@ cmake "%ADDONS_PATH%" -G "Visual Studio 14" ^
       -DCMAKE_USER_MAKE_RULES_OVERRIDE="%SCRIPTS_PATH%/CFlagOverrides.cmake" ^
       -DCMAKE_USER_MAKE_RULES_OVERRIDE_CXX="%SCRIPTS_PATH%/CXXFlagOverrides.cmake" ^
       -DCMAKE_INSTALL_PREFIX=%WORKDIR%\addons ^
-      -DCORE_SOURCE_DIR=%WORKDIR% ^
+      -DCMAKE_SOURCE_DIR=%WORKDIR% ^
       -DBUILD_DIR=%ADDONS_BUILD_PATH% ^
       -DADDON_DEPENDS_PATH=%ADDON_DEPENDS_PATH% ^
       -DPACKAGE_ZIP=ON ^