Commit 22650e1d84a994a06b79cfcf90996b8458b31a09
2023-12-06T09:50:31
move osx to 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
diff --git a/.gitignore b/.gitignore
index 9ec6577..a28f130 100644
--- a/.gitignore
+++ b/.gitignore
@@ -55,8 +55,8 @@ libc3/window/sdl2/demo/macos/c3_window_sdl2_demo_cov.app/
libc3/window/sdl2/demo/macos/c3_window_sdl2_demo_debug.app/
.libs/
*.lo
+macos/c3-v*
*.o
-osx/c3-v*
test/facts_test_dump_file.facts
test/facts_test_log_add.facts
test/facts_test_log_remove.facts
diff --git a/macos/Makefile b/macos/Makefile
new file mode 100644
index 0000000..844d4f9
--- /dev/null
+++ b/macos/Makefile
@@ -0,0 +1,38 @@
+## c3
+## Copyright 2022,2023 kmx.io <contact@kmx.io>
+##
+## Permission is hereby granted to use this software granted the above
+## copyright notice and this permission paragraph are included in all
+## copies and substantial portions of this software.
+##
+## THIS SOFTWARE IS PROVIDED "AS-IS" WITHOUT ANY GUARANTEE OF
+## PURPOSE AND PERFORMANCE. IN NO EVENT WHATSOEVER SHALL THE
+## AUTHOR BE CONSIDERED LIABLE FOR THE USE AND PERFORMANCE OF
+## THIS SOFTWARE.
+
+all: dmg
+
+DMG_FILES = \
+ ../libc3/window/cairo/quartz/demo/c3_window_cairo_quartz_demo.app \
+ ../libc3/window/cairo/quartz/demo/c3_window_cairo_quartz_demo_debug.app \
+ ../libc3/window/sdl2/demo/macos/c3_window_sdl2_demo.app \
+ ../libc3/window/sdl2/demo/macos/c3_window_sdl2_demo_debug.app \
+
+DESTDIR = c3-v${C3_VERSION}
+DMG = ${DESTDIR}.dmg
+
+CLEANFILES = ${DMG} ${DESTDIR} ${DESTDIR}.old
+
+clean:
+ rm -rf ${CLEANFILES}
+
+dmg:
+ rm -rf ${DESTDIR}.old
+ if [ -d ${DESTDIR} ]; then mv ${DESTDIR} ${DESTDIR}.old; fi
+ mkdir ${DESTDIR}
+ cp -r ${DMG_FILES} ${DESTDIR}
+ hdiutil create -volname "C3 v${C3_VERSION}" -srcfolder ${DESTDIR} -ov -format UDZO ${DESTDIR}.dmg
+
+.PHONY: all clean dmg
+
+include ../config.mk
diff --git a/osx/Makefile b/osx/Makefile
deleted file mode 100644
index 1e854a6..0000000
--- a/osx/Makefile
+++ /dev/null
@@ -1,36 +0,0 @@
-## c3
-## Copyright 2022,2023 kmx.io <contact@kmx.io>
-##
-## Permission is hereby granted to use this software granted the above
-## copyright notice and this permission paragraph are included in all
-## copies and substantial portions of this software.
-##
-## THIS SOFTWARE IS PROVIDED "AS-IS" WITHOUT ANY GUARANTEE OF
-## PURPOSE AND PERFORMANCE. IN NO EVENT WHATSOEVER SHALL THE
-## AUTHOR BE CONSIDERED LIABLE FOR THE USE AND PERFORMANCE OF
-## THIS SOFTWARE.
-
-all: dmg
-
-DMG_FILES = \
- ../libc3/window/cairo/quartz/demo/c3_window_cairo_quartz_demo.app \
- ../libc3/window/cairo/quartz/demo/c3_window_cairo_quartz_demo_debug.app
-
-DESTDIR = c3-v${C3_VERSION}
-DMG = ${DESTDIR}.dmg
-
-CLEANFILES = ${DMG} ${DESTDIR} ${DESTDIR}.old
-
-clean:
- rm -rf ${CLEANFILES}
-
-dmg:
- rm -rf ${DESTDIR}.old
- if [ -d ${DESTDIR} ]; then mv ${DESTDIR} ${DESTDIR}.old; fi
- mkdir ${DESTDIR}
- cp -r ${DMG_FILES} ${DESTDIR}
- hdiutil create -volname "C3 v${C3_VERSION}" -srcfolder ${DESTDIR} -ov -format UDZO ${DESTDIR}.dmg
-
-.PHONY: all clean dmg
-
-include ../config.mk