Skip to content

Commit 275acd1

Browse files
committed
Standardize on config/build as the default scripts
- config_qt or config_imgui for qt or imgui only - config/build is the path for everything. - these are just helpers. The github action has full build scripts too
1 parent 38bb328 commit 275acd1

9 files changed

+43
-27
lines changed

README.md

+7-7
Original file line numberDiff line numberDiff line change
@@ -148,14 +148,14 @@ git clone https://github.com/Rezonality/mutils
148148
cd mutils
149149
prebuild.bat
150150
config.bat
151-
build_all.bat
151+
build.bat
152152
153153
# Zep
154154
git clone https://github.com/Rezonality/zep
155155
cd zep
156156
set QT_INSTALL_LOCATION=C:\Qt\5.10.0\msvc2017_64 (for example - required for building QT)
157-
config_all.bat OR config.bat (for no Qt)
158-
build_all.bat
157+
config.bat OR config_qt.bat or config_imgui.bat (for qt and imgui respectively)
158+
build.bat
159159
```
160160

161161
# Linux
@@ -166,9 +166,9 @@ cd mutils
166166
chmod +x prebuild.bat
167167
chmod +x m3rdparty/packages/install.sh
168168
chmod +x config.sh
169-
chmod +x build_all.sh
169+
chmod +x build.sh
170170
./config.sh
171-
./build_all.sh
171+
./build.sh
172172
173173
# Qt
174174
sudo apt install qt-default (for Qt/Demo support)
@@ -177,8 +177,8 @@ set QT_INSTALL_LOCATION=C:\Qt\5.10.0\msvc2017_64 (example)
177177
# Zep
178178
git clone https://github.com/Rezonality/zep
179179
cd zep
180-
./config_all.sh OR ./config.sh (for no Qt)
181-
./build_all.sh
180+
./config.sh OR ./config_qt.sh or ./config_imgui.sh (for qt and imgui respectively)
181+
./build.sh
182182
```
183183

184184
# Mac

build.bat

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
cd build
2+
cmake --build . --config Debug
3+
cmake --install . --config Debug --prefix ../../vcpkg/packages/zep_x64-windows-static-md
4+
5+
cmake --build . --config Release
6+
cmake --install . --config Release --prefix ../../vcpkg/packages/zep_x64-windows-static-md
7+
8+
cmake --build . --config RelWithDebInfo
9+
cmake --install . --config RelWithDebInfo --prefix ../../vcpkg/packages/zep_x64-windows-static-md
10+
cd ..

config.bat

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
set CURRENT_DIR=%CD%
22
mkdir build > nul
33
cd build
4-
cmake -G "Visual Studio 16 2019" -A x64 -DZEP_FEATURE_CPP_FILE_SYSTEM=1 ..\
4+
cmake -G "Visual Studio 16 2019" -A x64 ..\
55
cd "%CURRENT_DIR%"
66

config.sh

+9-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1-
#!/bin/bash
1+
#!/bin/sh
22

3-
source config_all.sh
3+
mkdir build
4+
cd build
5+
if [ "$1" != "" ] ; then
6+
cmake -G "Unix Makefiles" -DBUILD_QT=ON -DBUILD_IMGUI=ON -DCMAKE_BUILD_TYPE=$1 ../
7+
else
8+
cmake -G "Unix Makefiles" -DBUILD_QT=ON -DBUILD_IMGUI=ON -DCMAKE_BUILD_TYPE=Release ../
9+
fi
10+
cd ../

config_all.bat

-6
This file was deleted.

config_all.sh

-10
This file was deleted.

config_imgui.bat

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
set CURRENT_DIR=%CD%
2+
mkdir build > nul
3+
cd build
4+
cmake -G "Visual Studio 16 2019" -A x64 -DBUILD_QT=NO -DBUILD_IMGUI=YES ..\
5+
cd "%CURRENT_DIR%"
6+

config_qt.bat

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ set CURRENT_DIR=%CD%
22
mkdir build > nul
33
cd build
44

5-
65
cmake -G "Visual Studio 15 2017 Win64" -DBUILD_QT=YES -DBUILD_IMGUI=NO ..\
76
cd "%CURRENT_DIR%"
87

config_qt.sh

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
#!/bin/sh
2+
3+
mkdir build
4+
cd build
5+
if [ "$1" != "" ] ; then
6+
cmake -G "Unix Makefiles" -DBUILD_QT=ON -DBUILD_IMGUI=OFF -DCMAKE_BUILD_TYPE=$1 ../
7+
else
8+
cmake -G "Unix Makefiles" -DBUILD_QT=ON -DBUILD_IMGUI=OFF -DCMAKE_BUILD_TYPE=Release ../
9+
fi
10+
cd ../

0 commit comments

Comments
 (0)