Commit f255b912cc19d274c3b9ef7a4d1f1efefde8f258
2024-03-24T18:46:18
fix build on 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 120 121 122 123 124
diff --git a/libc3_window/cairo/quartz/demo/Makefile b/libc3_window/cairo/quartz/demo/Makefile
index d35c515..ad4539d 100644
--- a/libc3_window/cairo/quartz/demo/Makefile
+++ b/libc3_window/cairo/quartz/demo/Makefile
@@ -20,21 +20,21 @@ CLEANFILES += ${CLEANFILES_COV}
DISTCLEANFILES = ${CLEANFILES} config.mk
IMG_SOURCES = \
- ../../../../../img/flaps.png \
- ../../../../../img/fly-dead.png \
- ../../../../../img/fly-noto.png \
- ../../../../../img/toast.png \
+ ../../../../img/flaps.png \
+ ../../../../img/fly-dead.png \
+ ../../../../img/fly-noto.png \
+ ../../../../img/toast.png \
FONT_SOURCES = \
- ../../../../../fonts/Computer-Modern \
- ../../../../../fonts/Courier\ New \
+ ../../../../fonts/Computer-Modern \
+ ../../../../fonts/Courier\ New \
build:
${MAKE} ${APP_PROG}
${MAKE} ${APP}/Contents/Frameworks
rsync -aP ${FONT_SOURCES} ${APP}/Contents/fonts/
rsync -aP ${IMG_SOURCES} ${APP}/Contents/img/
- rsync -aP --delete ../../../../../lib ${APP}/Contents/
+ rsync -aP --delete ../../../../lib ${APP}/Contents/
all:
${MAKE} build
@@ -47,7 +47,7 @@ asan:
${MAKE} ${APP_ASAN}/Contents/Frameworks
rsync -aP ${FONT_SOURCES} ${APP_ASAN}/Contents/fonts/
rsync -aP ${IMG_SOURCES} ${APP_ASAN}/Contents/img/
- rsync -aP --delete ../../../../../lib ${APP_ASAN}/Contents/
+ rsync -aP --delete ../../../../lib ${APP_ASAN}/Contents/
clean:
rm -rf ${CLEANFILES}
@@ -60,14 +60,14 @@ cov:
${MAKE} ${APP_COV}/Contents/Frameworks
rsync -aP ${FONT_SOURCES} ${APP_COV}/Contents/fonts/
rsync -aP ${IMG_SOURCES} ${APP_COV}/Contents/img/
- rsync -aP --delete ../../../../../lib ${APP_COV}/Contents/
+ rsync -aP --delete ../../../../lib ${APP_COV}/Contents/
debug:
${MAKE} ${APP_PROG_DEBUG}
${MAKE} ${APP_DEBUG}/Contents/Frameworks
rsync -aP ${FONT_SOURCES} ${APP_DEBUG}/Contents/fonts/
rsync -aP ${IMG_SOURCES} ${APP_DEBUG}/Contents/img/
- rsync -aP --delete ../../../../../lib ${APP_DEBUG}/Contents/
+ rsync -aP --delete ../../../../lib ${APP_DEBUG}/Contents/
demo: build
time ${APP_PROG}
diff --git a/libc3_window/sdl2/demo/macos/Makefile b/libc3_window/sdl2/demo/macos/Makefile
index bba9824..66f1a2d 100644
--- a/libc3_window/sdl2/demo/macos/Makefile
+++ b/libc3_window/sdl2/demo/macos/Makefile
@@ -20,23 +20,23 @@ CLEANFILES += ${CLEANFILES_COV}
DISTCLEANFILES = ${CLEANFILES} config.mk
IMG_SOURCES = \
- ../../../../../img/earth.png \
- ../../../../../img/flaps.256.png \
- ../../../../../img/flaps.png \
- ../../../../../img/fly-dead.png \
- ../../../../../img/fly-noto.png \
- ../../../../../img/matrix_shade.png \
- ../../../../../img/toast.128.png \
- ../../../../../img/toast.png \
+ ../../../../img/earth.png \
+ ../../../../img/flaps.256.png \
+ ../../../../img/flaps.png \
+ ../../../../img/fly-dead.png \
+ ../../../../img/fly-noto.png \
+ ../../../../img/matrix_shade.png \
+ ../../../../img/toast.128.png \
+ ../../../../img/toast.png \
FONT_SOURCES = \
- ../../../../../fonts/Courier\ New \
- ../../../../../fonts/NotoSans-Regular.ttf \
+ ../../../../fonts/Courier\ New \
+ ../../../../fonts/NotoSans-Regular.ttf \
build:
${MAKE} ${APP_PROG}
${MAKE} ${APP}/Contents/Frameworks
- rsync -aP --delete ../../../../../lib ${APP}/Contents/
+ rsync -aP --delete ../../../../lib ${APP}/Contents/
rsync -aP ${IMG_SOURCES} ${APP}/Contents/img/
rsync -aP ${FONT_SOURCES} ${APP}/Contents/fonts/
@@ -49,7 +49,7 @@ all:
asan:
${MAKE} ${APP_PROG_ASAN}
${MAKE} ${APP_ASAN}/Contents/Frameworks
- rsync -aP --delete ../../../../../lib ${APP_ASAN}/Contents/
+ rsync -aP --delete ../../../../lib ${APP_ASAN}/Contents/
rsync -aP ${IMG_SOURCES} ${APP_ASAN}/Contents/img/
rsync -aP ${FONT_SOURCES} ${APP_ASAN}/Contents/fonts/
@@ -62,14 +62,14 @@ clean_cov:
cov:
${MAKE} ${APP_PROG_COV}
${MAKE} ${APP_COV}/Contents/Frameworks
- rsync -aP --delete ../../../../../lib ${APP_COV}/Contents/
+ rsync -aP --delete ../../../../lib ${APP_COV}/Contents/
rsync -aP ${IMG_SOURCES} ${APP_COV}/Contents/img/
rsync -aP ${FONT_SOURCES} ${APP_COV}/Contents/fonts/
debug:
${MAKE} ${APP_PROG_DEBUG}
${MAKE} ${APP_DEBUG}/Contents/Frameworks
- rsync -aP --delete ../../../../../lib ${APP_DEBUG}/Contents/
+ rsync -aP --delete ../../../../lib ${APP_DEBUG}/Contents/
rsync -aP ${IMG_SOURCES} ${APP_DEBUG}/Contents/img/
rsync -aP ${FONT_SOURCES} ${APP_DEBUG}/Contents/fonts/