Skip to content

Commit

Permalink
Bug Fix: CI builds
Browse files Browse the repository at this point in the history
  • Loading branch information
BenjamenMeyer committed Oct 7, 2023
1 parent 41768a3 commit 7cdcf4f
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 6 deletions.
3 changes: 1 addition & 2 deletions script/build
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ echo "ROOT_DIR: ${ROOT_DIR}"
BUILD_DIR="${ROOT_DIR}/build"
echo "BUILD_DIR: ${BUILD_DIR}"
BIN_DIR="${ROOT_DIR}/bin"
SRC_DIR="${ROOT_DIR}/engine"
COMMAND=""

# -p creates if the target doesn't exist, noop otherwise
Expand All @@ -57,7 +56,7 @@ mkdir -pv "${BUILD_DIR}" && cd "${BUILD_DIR}"
# configure libraries and prepare for the Debug build having -Werror set,
# thus gating VS commits on being warning-free at some point in the near
# future -- see https://github.com/vegastrike/Vega-Strike-Engine-Source/issues/50
cmake $@ "${SRC_DIR}"
cmake $@ "${ROOT_DIR}"

# for a clean build only
# mut we can do it manually
Expand Down
2 changes: 1 addition & 1 deletion script/build.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
# You should have received a copy of the GNU General Public License
# along with Vega Strike. If not, see <https://www.gnu.org/licenses/>.

cmake -B build -S .\engine\ -DCMAKE_TOOLCHAIN_FILE="$env:VCPKG_ROOT\scripts\buildsystems\vcpkg.cmake" -DCMAKE_BUILD_TYPE=Release
cmake -B build -S .\ -DCMAKE_TOOLCHAIN_FILE="$env:VCPKG_ROOT\scripts\buildsystems\vcpkg.cmake" -DCMAKE_BUILD_TYPE=Release
cmake --build .\build\ --config Release -v
New-Item bin -ItemType Directory -Force
xcopy /y .\build\Release\*.* .\bin\
Expand Down
1 change: 0 additions & 1 deletion script/clean
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ ROOT_DIR=$(pwd)
BUILD_DIR=$ROOT_DIR/build
BIN_DIR=$ROOT_DIR/bin
DATA_DIR=$ROOT_DIR/data
SRC_DIR=$ROOT_DIR/engine

# delete build directory
echo "deleting build directory ($BUILD_DIR)"
Expand Down
3 changes: 1 addition & 2 deletions script/package
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
ROOT_DIR=$(pwd)
BUILD_DIR=$ROOT_DIR/build
BIN_DIR=$ROOT_DIR/bin
SRC_DIR=$ROOT_DIR/engine
PACKAGE_DIR=$ROOT_DIR/packages
VS_EXECUTABLE=${BUILD_DIR}/vegastrike-engine
VS_CONFIG_EXECUTABLE=${BUILD_DIR}/setup/vegasettings
Expand Down Expand Up @@ -156,7 +155,7 @@ function buildPackages()
{
# before running make package regen the Cmake data so that
# it picks up the dependencies just generated
cmake "${SRC_DIR}"
cmake "${ROOT_DIR}"
make package
make package_source
}
Expand Down

0 comments on commit 7cdcf4f

Please sign in to comment.