Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

buildenv/1.3.x: merge Windows directories in a single one #81

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions buildenv/1.3.x/win32-static-debug/build-all.bash

This file was deleted.

17 changes: 0 additions & 17 deletions buildenv/1.3.x/win32-static-no-ltcg/build-all.bash

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
:: Copyright 2014 The 'mumble-releng' Authors. All rights reserved.
:: Copyright 2014-2018 The 'mumble-releng' Authors. All rights reserved.
:: Use of this source code is governed by a BSD-style license that
:: can be found in the LICENSE file in the source tree or at
:: <http://mumble.info/mumble-releng/LICENSE>.
Expand All @@ -10,6 +10,4 @@

set WANT_WIN64_BUILDENV=1
set WANT_DEBUG_BUILDENV=1
set SETUP_DIR=%~dp0
cd %SETUP_DIR%\..\win32-static
setup.cmd %*
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
:: Copyright 2014 The 'mumble-releng' Authors. All rights reserved.
:: Copyright 2014-2018 The 'mumble-releng' Authors. All rights reserved.
:: Use of this source code is governed by a BSD-style license that
:: can be found in the LICENSE file in the source tree or at
:: <http://mumble.info/mumble-releng/LICENSE>.
Expand All @@ -9,6 +9,4 @@
@echo off

set WANT_DEBUG_BUILDENV=1
set SETUP_DIR=%~dp0
cd %SETUP_DIR%\..\win32-static
setup.cmd %*
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
:: Copyright 2014 The 'mumble-releng' Authors. All rights reserved.
:: Copyright 2014-2018 The 'mumble-releng' Authors. All rights reserved.
:: Use of this source code is governed by a BSD-style license that
:: can be found in the LICENSE file in the source tree or at
:: <http://mumble.info/mumble-releng/LICENSE>.
Expand All @@ -8,7 +8,6 @@

@echo off

set WANT_WIN64_BUILDENV=1
set WANT_NO_LTCG=1
set SETUP_DIR=%~dp0
cd %SETUP_DIR%\..\win32-static
setup.cmd %*
12 changes: 12 additions & 0 deletions buildenv/1.3.x/win32-static/setup-no-ltcg.cmd
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
:: Copyright 2014-2018 The 'mumble-releng' Authors. All rights reserved.
:: Use of this source code is governed by a BSD-style license that
:: can be found in the LICENSE file in the source tree or at
:: <http://mumble.info/mumble-releng/LICENSE>.

:: setup.cmd sets up a new Mumble build environment
:: in the user's home directory (%USERPROFILE%).

@echo off

set WANT_NO_LTCG=1
setup.cmd %*
12 changes: 12 additions & 0 deletions buildenv/1.3.x/win32-static/setup-x64.cmd
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
:: Copyright 2014-2018 The 'mumble-releng' Authors. All rights reserved.
:: Use of this source code is governed by a BSD-style license that
:: can be found in the LICENSE file in the source tree or at
:: <http://mumble.info/mumble-releng/LICENSE>.

:: setup.cmd sets up a new Mumble build environment
:: in the user's home directory (%USERPROFILE%).

@echo off

set WANT_WIN64_BUILDENV=1
setup.cmd %*
8 changes: 0 additions & 8 deletions buildenv/1.3.x/win64-static-debug/build-all.bash

This file was deleted.

16 changes: 0 additions & 16 deletions buildenv/1.3.x/win64-static-no-ltcg/build-all.bash

This file was deleted.

21 changes: 0 additions & 21 deletions buildenv/1.3.x/win64-static-no-ltcg/setup.cmd

This file was deleted.

16 changes: 0 additions & 16 deletions buildenv/1.3.x/win64-static/build-all.bash

This file was deleted.

20 changes: 0 additions & 20 deletions buildenv/1.3.x/win64-static/setup.cmd

This file was deleted.