diff options
| author | Kolja Lampe <razzeee@gmail.com> | 2018-04-19 20:00:00 +0200 |
|---|---|---|
| committer | Kolja Lampe <razzeee@gmail.com> | 2018-04-19 20:00:00 +0200 |
| commit | f699d2950ddd30270f5d1f3b64060cb601ec1c77 (patch) | |
| tree | a0293f1b45a8b465da504087cd27356440300489 | |
| parent | 2f0f95d1318d3acf2c8c071464d36cb16ea74027 (diff) | |
Cleanup due to x64 build changes
| -rw-r--r-- | appveyor.yml | 6 | ||||
| -rw-r--r-- | project/BuildDependencies/DownloadBuildDeps.bat | 5 | ||||
| -rw-r--r-- | project/BuildDependencies/DownloadMingwBuildEnv.bat | 5 | ||||
| -rw-r--r-- | project/Win32BuildSetup/BuildSetup.bat | 5 | ||||
| -rw-r--r-- | project/Win32BuildSetup/readme.txt | 2 | ||||
| -rw-r--r-- | tools/buildsteps/win32/make-mingwlibs.bat | 5 | ||||
| -rw-r--r-- | tools/buildsteps/win32/prepare-env.bat | 5 |
7 files changed, 4 insertions, 29 deletions
diff --git a/appveyor.yml b/appveyor.yml index f61aad004c..9d79f3dc3c 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -33,8 +33,8 @@ build_script: - ps: | if ($env:BUILD -eq "Kodi") { # Download dependencies - cd $env:APPVEYOR_BUILD_FOLDER\project\BuildDependencies - & .\DownloadBuildDeps.bat + cd $env:APPVEYOR_BUILD_FOLDER\tools\buildsteps\windows\win32 + & .\download-dependencies.bat # We are using AppVeyor's already installed msys64 environment, # no need to install msys/mingw environment. @@ -68,7 +68,7 @@ build_script: - ps: | if ($env:ADDONS.length -ne 0 -and $env:BUILD -ne "Kodi") { # Bootstrap - cd $env:APPVEYOR_BUILD_FOLDER\tools\buildsteps\win32 + cd $env:APPVEYOR_BUILD_FOLDER\tools\buildsteps\windows\win32 & .\bootstrap-addons.bat # Create build folder diff --git a/project/BuildDependencies/DownloadBuildDeps.bat b/project/BuildDependencies/DownloadBuildDeps.bat deleted file mode 100644 index d70e544f02..0000000000 --- a/project/BuildDependencies/DownloadBuildDeps.bat +++ /dev/null @@ -1,5 +0,0 @@ -@ECHO OFF - -PUSHD %~dp0\..\..\tools\buildsteps\windows\win32 -CALL download-dependencies.bat -POPD diff --git a/project/BuildDependencies/DownloadMingwBuildEnv.bat b/project/BuildDependencies/DownloadMingwBuildEnv.bat deleted file mode 100644 index 7dc614b1dc..0000000000 --- a/project/BuildDependencies/DownloadMingwBuildEnv.bat +++ /dev/null @@ -1,5 +0,0 @@ -@ECHO OFF - -PUSHD %~dp0\..\..\tools\buildsteps\windows\win32 -CALL download-msys2.bat %* -POPD diff --git a/project/Win32BuildSetup/BuildSetup.bat b/project/Win32BuildSetup/BuildSetup.bat deleted file mode 100644 index c06bd42b3f..0000000000 --- a/project/Win32BuildSetup/BuildSetup.bat +++ /dev/null @@ -1,5 +0,0 @@ -@ECHO OFF - -PUSHD %~dp0\..\..\tools\buildsteps\windows\win32 -CALL BuildSetup.bat %* -POPD diff --git a/project/Win32BuildSetup/readme.txt b/project/Win32BuildSetup/readme.txt index f6d3c212ac..00a570ba29 100644 --- a/project/Win32BuildSetup/readme.txt +++ b/project/Win32BuildSetup/readme.txt @@ -3,7 +3,7 @@ Prerequisites for building a Kodi for Windows installer: 1) See http://kodi.wiki/view/HOW-TO:Compile_for_Windows Usage: -1) Run BuildSetup.bat in project\Win32BuildSetup +1) Run BuildSetup.bat in tools\buildsteps\windows\{win32|x64|win32-uwp|x64-uwp|arm-uwp} 2) Watch the screen, maybe you're asked for input 3) Wait... Wait... Wait... You should now have KodiSetup-<lastcommitdate-gitrev>.exe file. diff --git a/tools/buildsteps/win32/make-mingwlibs.bat b/tools/buildsteps/win32/make-mingwlibs.bat deleted file mode 100644 index 4b94f9ccb6..0000000000 --- a/tools/buildsteps/win32/make-mingwlibs.bat +++ /dev/null @@ -1,5 +0,0 @@ -@ECHO OFF - -PUSHD %~dp0\..\windows\win32 -CALL make-mingwlibs.bat %* -POPD diff --git a/tools/buildsteps/win32/prepare-env.bat b/tools/buildsteps/win32/prepare-env.bat deleted file mode 100644 index 6b246b6ae6..0000000000 --- a/tools/buildsteps/win32/prepare-env.bat +++ /dev/null @@ -1,5 +0,0 @@ -@ECHO OFF - -PUSHD %~dp0\..\windows\win32 -CALL prepare-env.bat -POPD |