Commit ef93e50c6b881a8d194d157b3d54d06c77b976d7
2024-11-26T00:12:54
fix configure for win32
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
diff --git a/window/cairo/win32/configure b/window/cairo/win32/configure
index 885d1d4..f3b845e 100644
--- a/window/cairo/win32/configure
+++ b/window/cairo/win32/configure
@@ -15,7 +15,7 @@ set -e
export SRC_TOP="$(dirname "$PWD")"
-. ../../../../config.subr
+. ../../../config.subr
LIB=libkc3_window_cairo_win32.la
LIB_ASAN=libkc3_window_cairo_win32_asan.la
@@ -41,7 +41,7 @@ OBJECTS_COV="$(c2ext .cov.lo "$SOURCES")"
OBJECTS_DEBUG="$(c2ext .debug.lo "$SOURCES")"
# Common config for all targets
-CPPFLAGS="-I../../../../libffi/include -I../../../.. $CPPFLAGS"
+CPPFLAGS="-I../../.. $CPPFLAGS"
CFLAGS="$CFLAGS -W -Wall -Werror -std=c99 -pedantic"
LDFLAGS="--shared $LDFLAGS"
LIBS="$LIBS -rpath ${PREFIX}/lib"
diff --git a/window/cairo/win32/demo/configure b/window/cairo/win32/demo/configure
index 11b1cb7..79a5235 100644
--- a/window/cairo/win32/demo/configure
+++ b/window/cairo/win32/demo/configure
@@ -15,7 +15,7 @@ set -e
export SRC_TOP="$(dirname "$PWD")"
-. ../../../../../config.subr
+. ../../../../config.subr
PROG=c3_window_cairo_win32_demo
PROG_ASAN=c3_window_cairo_win32_demo_asan
@@ -45,7 +45,7 @@ echo "OBJECTS_DEBUG = $OBJECTS_DEBUG" >> ${CONFIG_MK}
# Common config for all targets
CFLAGS="$CFLAGS -W -Wall -Werror -std=c99 -pedantic"
-CPPFLAGS="-I../../../../../libffi/include -I../../../../.. $CPPFLAGS"
+CPPFLAGS="-I../../../.. $CPPFLAGS"
config_asan
config_gnu
config_i386