Fix glib and pyqt build

Signed-off-by: falkTX <falktx@falktx.com>

bootstrap-carla.sh

@@ -142,7 +142,8 @@ function build_pyqt() {
             # use PREFIX var
             sed -i -e "s|/usr|${PAWPAW_PREFIX}|g" installed.txt Makefile */Makefile
             if [ -f "QtCore/Makefile.Release" ]; then
-                sed -i -e "s|/usr|${PAWPAW_PREFIX}|g" */Makefile.Release
+                sed -i -e "s|/usr/include|${PAWPAW_PREFIX}/include|g" */Makefile.Release
+                sed -i -e "s|/usr/lib|${PAWPAW_PREFIX}/lib|g" */Makefile.Release
             fi
         fi
 

bootstrap-plugins.sh

@@ -93,18 +93,21 @@ if [ "${MACOS}" -eq 1 ] || [ "${WIN32}" -eq 1 ]; then
 
     if [ "${MACOS}" -eq 1 ]; then
         export EXTRA_LDFLAGS="-lresolv"
+    elif [ "${WIN32}" -eq 1 ]; then
+        export EXTRA_CFLAGS="-Wno-format -Wno-format-overflow"
+    fi
+
+    download glib ${GLIB_VERSION} "${GLIB_URL}" "${GLIB_TAR_EXT}"
+
+    if [ "${MACOS}" -eq 1 ]; then
         patch_file glib ${GLIB_VERSION} "glib/gconvert.c" '/#error/g'
 
         if [ "${MACOS_UNIVERSAL}" -eq 1 ]; then
             patch_file glib ${GLIB_VERSION} "glib/gatomic.c" 's/G_ATOMIC_ARM/__aarch64__/'
             patch_file glib ${GLIB_VERSION} "glib/gatomic.c" 's/G_ATOMIC_X86_64/__SSE2__/'
         fi
-
-    elif [ "${WIN32}" -eq 1 ]; then
-        export EXTRA_CFLAGS="-Wno-format -Wno-format-overflow"
     fi
 
-    download glib ${GLIB_VERSION} "${GLIB_URL}" "${GLIB_TAR_EXT}"
     build_autoconfgen glib ${GLIB_VERSION} "${GLIB_EXTRAFLAGS}"
 fi