Commit: 40edd1d34976d60d77e0c21e87d58363f3f8330c Parent: e19eef9f2ab1d314dd2cc5c028e5f8397e758d27 Author: Randy Palamar Date: Thu, 31 Oct 2024 10:06:27 -0600 remove system raylib support from build script this is pointless complexity Diffstat:
| M | build.sh | | | 45 | ++++++++++++++++++++------------------------- |
1 file changed, 20 insertions(+), 25 deletions(-)
diff --git a/build.sh b/build.sh @@ -10,7 +10,6 @@ ldflags="-lm" debug=${DEBUG} cc=${CC:-cc} -system_raylib=${USE_SYSTEM_RAYLIB} main=main_generic.c case $(uname -sm) in @@ -32,30 +31,26 @@ Linux*) ;; esac -if [ "$system_raylib" ]; then - ldflags="$(pkg-config raylib) $ldflags" -else - if [ ! -f external/lib/libraylib.a ]; then - git submodule update --init --depth=1 external/raylib - cmake --install-prefix="${PWD}/external" \ - -G "Ninja" -B external/raylib/build_static -S external/raylib \ - -D CMAKE_INSTALL_LIBDIR=lib -D CMAKE_BUILD_TYPE="Release" \ - -D BUILD_SHARED_LIBS=OFF \ - -DCUSTOMIZE_BUILD=ON -DBUILD_EXAMPLES=OFF -DWITH_PIC=ON \ - -DOPENGL_VERSION=4.3 -DUSE_AUDIO=OFF -DSUPPORT_MODULE_RAUDIO=OFF - cmake --build external/raylib/build_static - cmake --install external/raylib/build_static +if [ ! -f external/lib/libraylib.a ]; then + git submodule update --init --depth=1 external/raylib + cmake --install-prefix="${PWD}/external" \ + -G "Ninja" -B external/raylib/build_static -S external/raylib \ + -D CMAKE_INSTALL_LIBDIR=lib -D CMAKE_BUILD_TYPE="Release" \ + -D BUILD_SHARED_LIBS=OFF \ + -DCUSTOMIZE_BUILD=ON -DBUILD_EXAMPLES=OFF -DWITH_PIC=ON \ + -DOPENGL_VERSION=4.3 -DUSE_AUDIO=OFF -DSUPPORT_MODULE_RAUDIO=OFF + cmake --build external/raylib/build_static + cmake --install external/raylib/build_static - # NOTE: we also build the dynamic lib for debug purposes - cmake --install-prefix="${PWD}/external" \ - -G "Ninja" -B external/raylib/build_shared -S external/raylib \ - -D BUILD_SHARED_LIBS=ON \ - -D CMAKE_INSTALL_LIBDIR=lib -D CMAKE_BUILD_TYPE="Release" \ - -DCUSTOMIZE_BUILD=ON -DBUILD_EXAMPLES=OFF -DWITH_PIC=ON \ - -DOPENGL_VERSION=4.3 -DUSE_AUDIO=OFF -DSUPPORT_MODULE_RAUDIO=OFF - cmake --build external/raylib/build_shared - cmake --install external/raylib/build_shared - fi + # NOTE: we also build the dynamic lib for debug purposes + cmake --install-prefix="${PWD}/external" \ + -G "Ninja" -B external/raylib/build_shared -S external/raylib \ + -D BUILD_SHARED_LIBS=ON \ + -D CMAKE_INSTALL_LIBDIR=lib -D CMAKE_BUILD_TYPE="Release" \ + -DCUSTOMIZE_BUILD=ON -DBUILD_EXAMPLES=OFF -DWITH_PIC=ON \ + -DOPENGL_VERSION=4.3 -DUSE_AUDIO=OFF -DSUPPORT_MODULE_RAUDIO=OFF + cmake --build external/raylib/build_shared + cmake --install external/raylib/build_shared fi # Hot Reloading/Debugging @@ -66,7 +61,7 @@ if [ "$debug" ]; then libcflags="$cflags -fPIC -shared" ${cc} $libcflags beamformer.c -o $libname $ldflags else - [ ! "$system_raylib" ] && ldflags="./external/lib/libraylib.a $ldflags" + ldflags="./external/lib/libraylib.a ${ldflags}" fi ${cc} $cflags -o ogl $main $ldflags