CMake Make DJGPP CMake wrapper script be more generic

2 files changed, 36 insertions, 27 deletions

diff --git a/cmake/djgpp/djgpp-cmake-core.sh b/cmake/djgpp/djgpp-cmake-core.sh
new file mode 100755
index 0000000..a46b7ad
--- /dev/null
+++ b/cmake/djgpp/djgpp-cmake-core.sh
@@ -0,0 +1,34 @@
+#!/bin/bash
+
+djgpp_prefix=/usr/local/djgpp
+#cmake_toolchain_root=/home/vitaly/_git_repos/libADLMIDI/cmake/djgpp
+
+# export PKG_CONFIG_LIBDIR="${djgpp_prefix}/lib/pkgconfig"
+
+# djgpp_c_flags="-O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4"
+# export CFLAGS="$djgpp_c_flags"
+# export CXXFLAGS="$djgpp_c_flags"
+
+CUSTOM_PATH=${cmake_toolchain_root}:${djgpp_prefix}/bin:${djgpp_prefix}/libexec/gcc/i586-pc-msdosdjgpp/7.2.0:$PATH
+
+if [[ "$1" != '--build' ]]; then
+    echo "KEK [${CUSTOM_PATH}]"
+
+    PATH=${CUSTOM_PATH} cmake \
+        -DCMAKE_INSTALL_PREFIX:PATH=${djgpp_prefix} \
+        -DCMAKE_INSTALL_LIBDIR:PATH=${djgpp_prefix}/lib \
+        -DBUILD_SHARED_LIBS:BOOL=OFF \
+        -DCMAKE_TOOLCHAIN_FILE=${cmake_toolchain_root}/toolchain-djgpp.cmake \
+        "$@"
+
+#        -DINCLUDE_INSTALL_DIR:PATH=${djgpp_prefix}/include \\
+#        -DLIB_INSTALL_DIR:PATH=${djgpp_prefix}/lib \\
+#        -DSYSCONF_INSTALL_DIR:PATH=${djgpp_prefix}/etc \\
+#        -DSHARE_INSTALL_DIR:PATH=${djgpp_prefix}/share \\
+
+else
+    PATH=${CUSTOM_PATH} cmake "$@"
+fi
+
+#-DCMAKE_CROSSCOMPILING_EMULATOR=/usr/bin/i686-pc-msdosdjgpp-wine
+
diff --git a/cmake/djgpp/djgpp-cmake.sh b/cmake/djgpp/djgpp-cmake.sh
index 7b4fab6..11c130e 100755
--- a/cmake/djgpp/djgpp-cmake.sh
+++ b/cmake/djgpp/djgpp-cmake.sh
@@ -1,31 +1,6 @@
 #!/bin/bash
-djgpp_prefix=/usr/local/djgpp
 
-# export PKG_CONFIG_LIBDIR="${djgpp_prefix}/lib/pkgconfig"
+cmake_toolchain_root=/home/vitaly/_git_repos/libADLMIDI/cmake/djgpp
 
-# djgpp_c_flags="-O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4"
-# export CFLAGS="$djgpp_c_flags"
-# export CXXFLAGS="$djgpp_c_flags"
-
-CUSTOM_PATH=/home/vitaly/_git_repos/libADLMIDI/cmake/djgpp:${djgpp_prefix}/bin:/usr/local/djgpp/libexec/gcc/i586-pc-msdosdjgpp/7.2.0:$PATH
-
-if [[ "$1" != '--build' ]]; then
-    echo "KEK [${CUSTOM_PATH}]"
-
-    PATH=${CUSTOM_PATH} cmake \
-        -DCMAKE_INSTALL_PREFIX:PATH=${djgpp_prefix} \
-        -DCMAKE_INSTALL_LIBDIR:PATH=${djgpp_prefix}/lib \
-        -DINCLUDE_INSTALL_DIR:PATH=${djgpp_prefix}/include \
-        -DLIB_INSTALL_DIR:PATH=${djgpp_prefix}/lib \
-        -DSYSCONF_INSTALL_DIR:PATH=${djgpp_prefix}/etc \
-        -DSHARE_INSTALL_DIR:PATH=${djgpp_prefix}/share \
-        -DBUILD_SHARED_LIBS:BOOL=OFF \
-        -DCMAKE_TOOLCHAIN_FILE=/home/vitaly/_git_repos/libADLMIDI/cmake/djgpp/toolchain-djgpp.cmake \
-        "$@"
-
-else
-    PATH=${CUSTOM_PATH} cmake "$@"
-fi
-
-#-DCMAKE_CROSSCOMPILING_EMULATOR=/usr/bin/i686-pc-msdosdjgpp-wine
+source /home/vitaly/_git_repos/libADLMIDI/cmake/djgpp/djgpp-cmake-core.sh