Commit 60f91222ef266329db5a8a88f85d78b5fff6615c
2024-01-30T12:07:00
configure: macos
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 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119
diff --git a/libc3/window/cairo/quartz/configure b/libc3/window/cairo/quartz/configure
index 417cc35..6d24937 100755
--- a/libc3/window/cairo/quartz/configure
+++ b/libc3/window/cairo/quartz/configure
@@ -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../../../../libffi/include -I../../../.."
-CFLAGS="$CFLAGS -W -Wall -Werror -std=c99 -pedantic"
+CPPFLAGS="$CPPFLAGS -I../../../.."
+CFLAGS="$CFLAGS -W -Wall -Werror -std=c11 -pedantic"
OBJCFLAGS="$CFLAGS -W -Wall -Werror"
LDFLAGS="--shared $LDFLAGS"
LIBS="$LIBS"
@@ -58,6 +58,7 @@ config_gnu
pkg_config cairo
pkg_config cairo-ft
config_lib COCOA -framework Cocoa
+pkg_config libffi
pkg_config xkbcommon
# Asan config
diff --git a/libc3/window/cairo/quartz/demo/configure b/libc3/window/cairo/quartz/demo/configure
index f536b99..f2e7cbd 100755
--- a/libc3/window/cairo/quartz/demo/configure
+++ b/libc3/window/cairo/quartz/demo/configure
@@ -72,8 +72,8 @@ OBJECTS_DEBUG="$OBJECTS_DEBUG $(swift2ext .debug.lo "$SWIFT_SOURCES")"
echo "OBJECTS_DEBUG = $OBJECTS_DEBUG" >> ${CONFIG_MK}
# Common config for all targets
-CPPFLAGS="$CPPFLAGS -I../../../../../libffi/include -I../../../../.."
-CFLAGS="$CFLAGS -W -Wall -Werror -std=c99 -pedantic"
+CPPFLAGS="$CPPFLAGS -I../../../../.."
+CFLAGS="$CFLAGS -W -Wall -Werror -std=c11 -pedantic"
OBJCFLAGS="$CFLAGS -W -Wall -Werror"
LDFLAGS="$LDFLAGS -framework Cocoa"
LIBS="$LIBS"
@@ -81,6 +81,7 @@ config_asan
config_gnu
pkg_config cairo
pkg_config cairo-ft
+pkg_config libffi
pkg_config xkbcommon
# Asan config
@@ -205,7 +206,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="../../../../../libffi/.libs/libffi.8.dylib ../../../../.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="../../../../.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}
@@ -221,7 +222,7 @@ echo ".PHONY: \\" >> ${CONFIG_MK}
echo " ${APP}/Contents/Frameworks \\" >> ${CONFIG_MK}
echo " ${APP_PROG}" >> ${CONFIG_MK}
-BUNDLE_LIBS_ASAN="../../../../../libffi/.libs/libffi.8.dylib ../../../../.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="../../../../.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}
@@ -237,7 +238,7 @@ echo ".PHONY: \\" >> ${CONFIG_MK}
echo " ${APP_ASAN}/Contents/Frameworks \\" >> ${CONFIG_MK}
echo " ${APP_PROG_ASAN}" >> ${CONFIG_MK}
-BUNDLE_LIBS_COV="../../../../../libffi/.libs/libffi.8.dylib ../../../../.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="../../../../.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}
@@ -253,7 +254,7 @@ echo ".PHONY: \\" >> ${CONFIG_MK}
echo " ${APP_COV}/Contents/Frameworks \\" >> ${CONFIG_MK}
echo " ${APP_PROG}" >> ${CONFIG_MK}
-BUNDLE_LIBS_DEBUG="../../../../../libffi/.libs/libffi.8.dylib ../../../../.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="../../../../.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}
diff --git a/libc3/window/sdl2/configure b/libc3/window/sdl2/configure
index 5eb6bb4..f5216c8 100755
--- a/libc3/window/sdl2/configure
+++ b/libc3/window/sdl2/configure
@@ -49,6 +49,7 @@ pkg_config gl
pkg_config glew
pkg_config glu
pkg_config glut
+pkg_config libffi
pkg_config libpng
config_lib OPENGL -framework OpenGL
pkg_config sdl2
diff --git a/libc3/window/sdl2/demo/configure b/libc3/window/sdl2/demo/configure
index 0f8cd83..32d57c9 100755
--- a/libc3/window/sdl2/demo/configure
+++ b/libc3/window/sdl2/demo/configure
@@ -56,6 +56,7 @@ pkg_config gl
pkg_config glew
pkg_config glu
pkg_config glut
+pkg_config libffi
pkg_config libpng
config_lib OPENGL -framework OpenGL
config_lib OPENGL -lopengl32 -lglu32
diff --git a/libc3/window/sdl2/demo/macos/configure b/libc3/window/sdl2/demo/macos/configure
index 7acf03c..4f6ec9c 100755
--- a/libc3/window/sdl2/demo/macos/configure
+++ b/libc3/window/sdl2/demo/macos/configure
@@ -52,7 +52,7 @@ echo "${APP_PROG}: ../.libs/${PROG}" >> ${CONFIG_MK}
echo " mkdir -p ${APP}/Contents/MacOS" >> ${CONFIG_MK}
echo " cp ../.libs/${PROG} ${APP_PROG}" >> ${CONFIG_MK}
-BUNDLE_LIBS_COMMON="/usr/local/lib/libSDL2-2.0.0.dylib ../../../../../libffi/.libs/libffi.8.dylib"
+BUNDLE_LIBS_COMMON="/usr/local/lib/libSDL2-2.0.0.dylib"
BUNDLE_LIBS="${BUNDLE_LIBS_COMMON} ../../../../.libs/libc3.0.dylib ../../../.libs/libc3_window.0.dylib ../../.libs/libc3_window_sdl2.0.dylib"
echo >> ${CONFIG_MK}