diff options
| author | ronie <ronie@users.noreply.github.com> | 2016-02-26 23:23:08 +0100 |
|---|---|---|
| committer | ronie <ronie@users.noreply.github.com> | 2016-03-01 20:48:00 +0100 |
| commit | de08bafa12972688aa7aee6c83091fe67f0b020a (patch) | |
| tree | 5d95f978bfd89c6fb704bdb13bd9c2f3e55e2c4d /project | |
| parent | daf2dcdc66ef6f9c2f91cbfc41edb5ba4b79f6f8 (diff) | |
build estouchy instead of re-touched
Diffstat (limited to 'project')
| -rw-r--r-- | project/Win32BuildSetup/BuildSetup.bat | 14 | ||||
| -rw-r--r-- | project/cmake/CMakeLists.txt | 5 |
2 files changed, 7 insertions, 12 deletions
diff --git a/project/Win32BuildSetup/BuildSetup.bat b/project/Win32BuildSetup/BuildSetup.bat index a0acacdbdb..3364d24403 100644 --- a/project/Win32BuildSetup/BuildSetup.bat +++ b/project/Win32BuildSetup/BuildSetup.bat @@ -191,8 +191,8 @@ set WORKSPACE=%CD%\..\.. Echo addons\repository.pvr-osx32.xbmc.org\>>exclude.txt Echo addons\repository.pvr-osx64.xbmc.org\>>exclude.txt rem Exclude skins as they're copied by their own script - Echo addons\skin.re-touched\>>exclude.txt Echo addons\skin.estuary\>>exclude.txt + Echo addons\skin.estouchy\>>exclude.txt md BUILD_WIN32\application @@ -232,13 +232,11 @@ set WORKSPACE=%CD%\..\.. cd ..\..\addons\skin.estuary call build.bat > NUL cd %build_path% - - IF EXIST ..\..\addons\skin.re-touched\build.bat ( - ECHO Building Touch Skin... - cd ..\..\addons\skin.re-touched - call build.bat > NUL - cd %build_path% - ) + + ECHO Building Estouchy Skin... + cd ..\..\addons\skin.estouchy + call build.bat > NUL + cd %build_path% rem restore color and title, some scripts mess these up COLOR 1B diff --git a/project/cmake/CMakeLists.txt b/project/cmake/CMakeLists.txt index dbfd88d201..f929b3f11b 100644 --- a/project/cmake/CMakeLists.txt +++ b/project/cmake/CMakeLists.txt @@ -197,10 +197,6 @@ if(NOT WIN32) endif() endif() -if(ENABLE_SKIN_TOUCHED) - list(APPEND DEP_DEFINES "-DHAS_SKIN_TOUCHED=1") -endif() - if(ENABLE_CCACHE) core_optional_dep(CCache) endif() @@ -260,6 +256,7 @@ copy_files_from_filelist_to_buildtree(${PROJECT_SOURCE_DIR}/installdata/common/* ${PROJECT_SOURCE_DIR}/installdata/${CORE_SYSTEM_NAME}/*.txt) list(APPEND SKINS "${CORE_SOURCE_DIR}/addons/skin.estuary\;${CORE_SOURCE_DIR}") +list(APPEND SKINS "${CORE_SOURCE_DIR}/addons/skin.estouchy\;${CORE_SOURCE_DIR}") # These are skins that are copied into place from the source tree foreach(skin ${SKINS}) |