-
-
Notifications
You must be signed in to change notification settings - Fork 7
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Improved cmake --buiild for windows as well. Fix compile error.
- Loading branch information
Showing
3 changed files
with
8 additions
and
17 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,11 +1,10 @@ | ||
#!/usr/bin/env bash | ||
# By: Melroy van den Berg | ||
# Description: Build Windows 64-bit production release | ||
|
||
rm -rf build_prod_win | ||
mkdir build_prod_win | ||
x86_64-w64-mingw32.static-cmake -GNinja -DDOXYGEN:BOOL=FALSE -DCMAKE_BUILD_TYPE=Release -B build_prod_win | ||
x86_64-w64-mingw32.static-cmake --build ./build_prod_win --config Release | ||
# Build packages | ||
cd build_prod_win | ||
|
||
x86_64-w64-mingw32.static-cmake -G Ninja -DDOXYGEN:BOOL=FALSE -DCMAKE_BUILD_TYPE=Release .. && | ||
ninja && | ||
cpack -C Release -G NSIS | ||
# For some reason it couldn't find the makensis binary, hence the -D option | ||
cpack -D CPACK_NSIS_EXECUTABLE=/usr/bin/makensis -C Release -G NSIS |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,18 +1,10 @@ | ||
#!/usr/bin/env bash | ||
# By: Melroy van den Berg | ||
# Description: Development build Windows 64-bit | ||
|
||
if [ ! -d "build_win" ]; then | ||
echo "Creating build directory..." | ||
mkdir build_win | ||
fi | ||
|
||
if [ -z "$(ls build_win)" ]; then | ||
echo "INFO: Run cmake & ninja" | ||
cd build_win | ||
x86_64-w64-mingw32.static-cmake -G Ninja .. | ||
x86_64-w64-mingw32.static-cmake -GNinja -B build_win | ||
else | ||
echo "INFO: Only run ninja..." | ||
cd build_win | ||
fi | ||
ninja | ||
x86_64-w64-mingw32.static-cmake --build ./build_win |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters