Commit d5bf908a3de3e8b6f0b60a7e846ffd36afcfd685
2024-03-24T16:12:12
fix build on mac
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91
diff --git a/libc3_window/cairo/quartz/configure b/libc3_window/cairo/quartz/configure
index 0683771..a76ca69 100755
--- a/libc3_window/cairo/quartz/configure
+++ b/libc3_window/cairo/quartz/configure
@@ -15,7 +15,7 @@ set -e
export SRC_TOP="$(dirname "$PWD")"
-. ../../../../config.subr
+. ../../../config.subr
LIB=libc3_window_cairo_quartz.la
LIB_ASAN=libc3_window_cairo_quartz_asan.la
@@ -48,8 +48,8 @@ OBJECTS_DEBUG="$OBJECTS_DEBUG $(objc2ext .debug.lo "$OBJC_SOURCES")"
echo "OBJECTS_DEBUG = $OBJECTS_DEBUG" >> ${CONFIG_MK}
# Common config for all targets
-CPPFLAGS="$CPPFLAGS -I../../../.."
-CFLAGS="$CFLAGS -W -Wall -Werror -std=c11 -pedantic"
+CPPFLAGS="$CPPFLAGS -I../../.."
+CFLAGS="$CFLAGS -W -Wall -Werror -std=c11 -pedantic -pipe"
OBJCFLAGS="$CFLAGS -W -Wall -Werror"
LDFLAGS="--shared $LDFLAGS"
LIBS="$LIBS"
@@ -81,7 +81,7 @@ LOCAL_LIBS_DEBUG="../libc3_window_cairo_debug.la"
LIBS_DEBUG="$LOCAL_LIBS_DEBUG $LIBS"
# Main config
-DEFAULT_CFLAGS="-O2 -pipe"
+DEFAULT_CFLAGS="-O2 -fPIC"
if [ "x$ENV_CFLAGS" = "x" ]; then
CFLAGS="$CFLAGS $DEFAULT_CFLAGS"
fi
diff --git a/libc3_window/cairo/quartz/demo/configure b/libc3_window/cairo/quartz/demo/configure
index 2363ee0..ffb9a12 100755
--- a/libc3_window/cairo/quartz/demo/configure
+++ b/libc3_window/cairo/quartz/demo/configure
@@ -15,7 +15,7 @@ set -e
export SRC_TOP="$(dirname "$PWD")"
-. ../../../../../config.subr
+. ../../../../config.subr
PROG=c3_window_cairo_quartz_demo
PROG_ASAN=c3_window_cairo_quartz_demo_asan
@@ -72,7 +72,7 @@ OBJECTS_DEBUG="$OBJECTS_DEBUG $(swift2ext .debug.lo "$SWIFT_SOURCES")"
echo "OBJECTS_DEBUG = $OBJECTS_DEBUG" >> ${CONFIG_MK}
# Common config for all targets
-CPPFLAGS="$CPPFLAGS -I../../../../.."
+CPPFLAGS="$CPPFLAGS -I../../../.."
CFLAGS="$CFLAGS -W -Wall -Werror -std=c11 -pedantic"
OBJCFLAGS="$CFLAGS -W -Wall -Werror"
LDFLAGS="$LDFLAGS -framework Cocoa"
@@ -207,7 +207,7 @@ echo "${APP_PROG_DEBUG}: ${PROG_DEBUG}" >> ${CONFIG_MK}
echo " mkdir -p $(dirname $APP_PROG_DEBUG)" >> ${CONFIG_MK}
echo " cp .libs/${PROG_DEBUG} ${APP_PROG_DEBUG}" >> ${CONFIG_MK}
-BUNDLE_LIBS="../../../../.libs/libc3.0.dylib ../../../.libs/libc3_window.0.dylib ../../.libs/libc3_window_cairo.0.dylib ../../demo/.libs/libc3_window_cairo_demo.0.dylib ../.libs/libc3_window_cairo_quartz.0.dylib"
+BUNDLE_LIBS="../../../../libc3/.libs/libc3.0.dylib ../../../.libs/libc3_window.0.dylib ../../.libs/libc3_window_cairo.0.dylib ../../demo/.libs/libc3_window_cairo_demo.0.dylib ../.libs/libc3_window_cairo_quartz.0.dylib"
echo >> ${CONFIG_MK}
echo "${APP}/Contents/Frameworks: ${BUNDLE_LIBS}" >> ${CONFIG_MK}
echo " mkdir -p ${APP}/Contents/Frameworks" >> ${CONFIG_MK}
@@ -223,7 +223,7 @@ echo ".PHONY: \\" >> ${CONFIG_MK}
echo " ${APP}/Contents/Frameworks \\" >> ${CONFIG_MK}
echo " ${APP_PROG}" >> ${CONFIG_MK}
-BUNDLE_LIBS_ASAN="../../../../.libs/libc3_asan.0.dylib ../../../.libs/libc3_window_asan.0.dylib ../../.libs/libc3_window_cairo_asan.0.dylib ../../demo/.libs/libc3_window_cairo_demo_asan.0.dylib ../.libs/libc3_window_cairo_quartz_asan.0.dylib"
+BUNDLE_LIBS_ASAN="../../../../libc3/.libs/libc3_asan.0.dylib ../../../.libs/libc3_window_asan.0.dylib ../../.libs/libc3_window_cairo_asan.0.dylib ../../demo/.libs/libc3_window_cairo_demo_asan.0.dylib ../.libs/libc3_window_cairo_quartz_asan.0.dylib"
echo >> ${CONFIG_MK}
echo "${APP_ASAN}/Contents/Frameworks: ${BUNDLE_LIBS_ASAN}" >> ${CONFIG_MK}
echo " mkdir -p ${APP_ASAN}/Contents/Frameworks" >> ${CONFIG_MK}
@@ -239,7 +239,7 @@ echo ".PHONY: \\" >> ${CONFIG_MK}
echo " ${APP_ASAN}/Contents/Frameworks \\" >> ${CONFIG_MK}
echo " ${APP_PROG_ASAN}" >> ${CONFIG_MK}
-BUNDLE_LIBS_COV="../../../../.libs/libc3_cov.0.dylib ../../../.libs/libc3_window_cov.0.dylib ../../.libs/libc3_window_cairo_cov.0.dylib ../../demo/.libs/libc3_window_cairo_demo_cov.0.dylib ../.libs/libc3_window_cairo_quartz_cov.0.dylib"
+BUNDLE_LIBS_COV="../../../../libc3/.libs/libc3_cov.0.dylib ../../../.libs/libc3_window_cov.0.dylib ../../.libs/libc3_window_cairo_cov.0.dylib ../../demo/.libs/libc3_window_cairo_demo_cov.0.dylib ../.libs/libc3_window_cairo_quartz_cov.0.dylib"
echo >> ${CONFIG_MK}
echo "${APP_COV}/Contents/Frameworks: ${BUNDLE_LIBS_COV}" >> ${CONFIG_MK}
echo " mkdir -p ${APP_COV}/Contents/Frameworks" >> ${CONFIG_MK}
@@ -255,7 +255,7 @@ echo ".PHONY: \\" >> ${CONFIG_MK}
echo " ${APP_COV}/Contents/Frameworks \\" >> ${CONFIG_MK}
echo " ${APP_PROG}" >> ${CONFIG_MK}
-BUNDLE_LIBS_DEBUG="../../../../.libs/libc3_debug.0.dylib ../../../.libs/libc3_window_debug.0.dylib ../../.libs/libc3_window_cairo_debug.0.dylib ../../demo/.libs/libc3_window_cairo_demo_debug.0.dylib ../.libs/libc3_window_cairo_quartz_debug.0.dylib"
+BUNDLE_LIBS_DEBUG="../../../../libc3/.libs/libc3_debug.0.dylib ../../../.libs/libc3_window_debug.0.dylib ../../.libs/libc3_window_cairo_debug.0.dylib ../../demo/.libs/libc3_window_cairo_demo_debug.0.dylib ../.libs/libc3_window_cairo_quartz_debug.0.dylib"
echo >> ${CONFIG_MK}
echo "${APP_DEBUG}/Contents/Frameworks: ${BUNDLE_LIBS_DEBUG}" >> ${CONFIG_MK}
echo " mkdir -p ${APP_DEBUG}/Contents/Frameworks" >> ${CONFIG_MK}