build scripts update

uliss · Oct 14, 2017 · aad30d0 · aad30d0
1 parent 8decb61
commit aad30d0
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 29 deletions.
diff --git a/ceammc/distrib/win/homebrew/build_deps.sh b/ceammc/distrib/win/homebrew/build_deps.sh
@@ -339,24 +339,6 @@ function install_tk() {
     make install
 }
 
-function install_runtime() {
-    pkg="MSVC runtime"
-    cd "${CWD}"
-
-    banner "${pkg}"
-    mkdir -p msvcrt
-    cd msvcrt
-
-    if [ ! -f "vcredist_x86.exe" ]
-    then
-        wget https://download.microsoft.com/download/5/B/C/5BC5DBB3-652D-4DCE-B14A-475AB85EEF6E/vcredist_x86.exe
-    fi
-
-    cabextract -d vcredist "vcredist_x86.exe"
-    cabextract "vcredist/vc_red.cab"
-    cp "F_CENTRAL_msvcr100_x86" ${PREFIX}/bin/msvcr100.dll
-}
-
 function install_fonts() {
     pkg="DejaVu fonts"
     cd "${CWD}"
@@ -393,7 +375,6 @@ case ${PKG} in
         install_sndfile
         install_portaudio
         install_fonts
-        instal_runtime
         ;;
     modplug)
         install_libmodplug
@@ -428,9 +409,6 @@ case ${PKG} in
     portaudio)
         install_portaudio
         ;;
-    runtime)
-        install_runtime
-        ;;
     fonts)
         install_fonts
         ;;

diff --git a/ceammc/distrib/win/homebrew/build_pd_mingw.sh b/ceammc/distrib/win/homebrew/build_pd_mingw.sh
@@ -22,6 +22,14 @@ CC=${HOST}-gcc
 CPP=${HOST}-cpp
 CXX=${HOST}-c++
 AR=${HOST}-ar
+TC="$CWD/Toolchain-mingw32.cmake"
+
+if [ ! -f $TC ]; then
+	echo "Toolchain file not found: $TC"
+	echo "Copy file from ${PD_DIR}/ceammc/distrib/win"
+	echo " and edit for your system"
+	exit 1
+fi
 
 mkdir -p pd
 cd pd
@@ -31,21 +39,23 @@ export ProgramW6432="${HOME}/.wine/drive_c/Program Files/"
 export PROGRAMFILES="${HOME}/.wine/drive_c/Program Files/"
 export DNSSD_ROOT="${HOME}/.wine/drive_c/Program\ Files/Bonjour SDK"
 
-cmake -DCMAKE_TOOLCHAIN_FILE=../Toolchain-mingw32.cmake \
+cmake -DCMAKE_TOOLCHAIN_FILE=$TC \
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_PREFIX_PATH=${PREFIX} \
     -DBOOST_ROOT=/usr/local/include \
+    -DWITH_FFTW=ON \
+    -DFFTW_ROOT=/opt/local/mingw32 \
     -DWITH_DUMMY_AUDIO=OFF \
     -DWITH_DUMMY_MIDI=OFF \
     -DWITH_PORTAUDIO=ON \
     -DWITH_MMIO=OFF \
     -DCMAKE_INSTALL_PREFIX=${PREFIX}/pd \
-    ${PD_DIR}
+    ${PD_DIR}/..
 
 make -j3 install
 
-echo "Copy about file..."
-cat ceammc/ext/doc/about.pd | sed "s/%GIT_BRANCH%/$GIT_BRANCH/g" | \
-   sed "s/%GIT_COMMIT%/$GIT_COMMIT/g" | \
-   sed "s/%BUILD_DATE%/$CURRENT_DATE/g" > tmp.about.pd
-cp tmp.about.pd ceammc/ext/doc/about.pd
+#echo "Copy about file..."
+#cat ceammc/ext/doc/about.pd | sed "s/%GIT_BRANCH%/$GIT_BRANCH/g" | \
+#   sed "s/%GIT_COMMIT%/$GIT_COMMIT/g" | \
+#   sed "s/%BUILD_DATE%/$CURRENT_DATE/g" > tmp.about.pd
+#cp tmp.about.pd ceammc/ext/doc/about.pd