From 1a22d592766823b3d7926418c72b553d1cbeb35a Mon Sep 17 00:00:00 2001 From: Vinyl Darkscratch Date: Tue, 6 Mar 2018 01:24:45 -0800 Subject: [PATCH] Rename macOS journal folder --- journal/journal.pro | 92 +++++++++++------------ journal/{mac => unix}/LICENSE | 0 journal/{mac => unix}/images/c1.png | Bin journal/{mac => unix}/images/c2.png | Bin journal/{mac => unix}/images/c3.png | Bin journal/{mac => unix}/images/c4.png | Bin journal/{mac => unix}/images/c5.png | Bin journal/{mac => unix}/images/c6.png | Bin journal/{mac => unix}/images/c7.png | Bin journal/{mac => unix}/images/default.png | Bin journal/{mac => unix}/images/final.png | Bin journal/{mac => unix}/images/niko1.png | Bin journal/{mac => unix}/images/niko2.png | Bin journal/{mac => unix}/images/niko3.png | Bin journal/{mac => unix}/images/s1.png | Bin journal/{mac => unix}/images/s2.png | Bin journal/{mac => unix}/images/s3.png | Bin journal/{mac => unix}/images/s4.png | Bin journal/{mac => unix}/images/save.png | Bin journal/{mac => unix}/images/t1.png | Bin journal/{mac => unix}/images/t10.png | Bin journal/{mac => unix}/images/t11.png | Bin journal/{mac => unix}/images/t12.png | Bin journal/{mac => unix}/images/t13.png | Bin journal/{mac => unix}/images/t14.png | Bin journal/{mac => unix}/images/t15.png | Bin journal/{mac => unix}/images/t16.png | Bin journal/{mac => unix}/images/t2.png | Bin journal/{mac => unix}/images/t3.png | Bin journal/{mac => unix}/images/t4.png | Bin journal/{mac => unix}/images/t5.png | Bin journal/{mac => unix}/images/t6.png | Bin journal/{mac => unix}/images/t7.png | Bin journal/{mac => unix}/images/t8.png | Bin journal/{mac => unix}/images/t9.png | Bin journal/{mac => unix}/journal.py | 0 journal/{mac => unix}/journal.spec | 0 journal/{mac => unix}/qt.conf | 0 make-oneshot-mac.command | 4 +- 39 files changed, 48 insertions(+), 48 deletions(-) rename journal/{mac => unix}/LICENSE (100%) rename journal/{mac => unix}/images/c1.png (100%) rename journal/{mac => unix}/images/c2.png (100%) rename journal/{mac => unix}/images/c3.png (100%) rename journal/{mac => unix}/images/c4.png (100%) rename journal/{mac => unix}/images/c5.png (100%) rename journal/{mac => unix}/images/c6.png (100%) rename journal/{mac => unix}/images/c7.png (100%) rename journal/{mac => unix}/images/default.png (100%) rename journal/{mac => unix}/images/final.png (100%) rename journal/{mac => unix}/images/niko1.png (100%) rename journal/{mac => unix}/images/niko2.png (100%) rename journal/{mac => unix}/images/niko3.png (100%) rename journal/{mac => unix}/images/s1.png (100%) rename journal/{mac => unix}/images/s2.png (100%) rename journal/{mac => unix}/images/s3.png (100%) rename journal/{mac => unix}/images/s4.png (100%) rename journal/{mac => unix}/images/save.png (100%) rename journal/{mac => unix}/images/t1.png (100%) rename journal/{mac => unix}/images/t10.png (100%) rename journal/{mac => unix}/images/t11.png (100%) rename journal/{mac => unix}/images/t12.png (100%) rename journal/{mac => unix}/images/t13.png (100%) rename journal/{mac => unix}/images/t14.png (100%) rename journal/{mac => unix}/images/t15.png (100%) rename journal/{mac => unix}/images/t16.png (100%) rename journal/{mac => unix}/images/t2.png (100%) rename journal/{mac => unix}/images/t3.png (100%) rename journal/{mac => unix}/images/t4.png (100%) rename journal/{mac => unix}/images/t5.png (100%) rename journal/{mac => unix}/images/t6.png (100%) rename journal/{mac => unix}/images/t7.png (100%) rename journal/{mac => unix}/images/t8.png (100%) rename journal/{mac => unix}/images/t9.png (100%) rename journal/{mac => unix}/journal.py (100%) rename journal/{mac => unix}/journal.spec (100%) rename journal/{mac => unix}/qt.conf (100%) diff --git a/journal/journal.pro b/journal/journal.pro index 68f50ae..52dff0a 100644 --- a/journal/journal.pro +++ b/journal/journal.pro @@ -3,58 +3,58 @@ CONFIG -= app_bundle qt QMAKE_CFLAGS += -std=gnu11 # Linux -unix:!macx { - SOURCES += \ - linux/main.c \ - linux/niko.c \ - linux/journal.c \ - linux/image/niko1.c \ - linux/image/niko2.c \ - linux/image/niko3.c \ - linux/image/default.c \ - linux/image/c1.c \ - linux/image/c2.c \ - linux/image/c3.c \ - linux/image/c4.c \ - linux/image/c5.c \ - linux/image/c6.c \ - linux/image/c7.c \ - linux/image/s1.c \ - linux/image/s2.c \ - linux/image/s3.c \ - linux/image/s4.c \ - linux/image/t1.c \ - linux/image/t2.c \ - linux/image/t3.c \ - linux/image/t4.c \ - linux/image/t5.c \ - linux/image/t6.c \ - linux/image/t7.c \ - linux/image/t8.c \ - linux/image/t9.c \ - linux/image/t10.c \ - linux/image/t11.c \ - linux/image/t12.c \ - linux/image/t13.c \ - linux/image/t14.c \ - linux/image/t15.c \ - linux/image/t16.c \ - linux/image/final.c \ - linux/image/save.c +# unix:!macx { +# SOURCES += \ +# linux/main.c \ +# linux/niko.c \ +# linux/journal.c \ +# linux/image/niko1.c \ +# linux/image/niko2.c \ +# linux/image/niko3.c \ +# linux/image/default.c \ +# linux/image/c1.c \ +# linux/image/c2.c \ +# linux/image/c3.c \ +# linux/image/c4.c \ +# linux/image/c5.c \ +# linux/image/c6.c \ +# linux/image/c7.c \ +# linux/image/s1.c \ +# linux/image/s2.c \ +# linux/image/s3.c \ +# linux/image/s4.c \ +# linux/image/t1.c \ +# linux/image/t2.c \ +# linux/image/t3.c \ +# linux/image/t4.c \ +# linux/image/t5.c \ +# linux/image/t6.c \ +# linux/image/t7.c \ +# linux/image/t8.c \ +# linux/image/t9.c \ +# linux/image/t10.c \ +# linux/image/t11.c \ +# linux/image/t12.c \ +# linux/image/t13.c \ +# linux/image/t14.c \ +# linux/image/t15.c \ +# linux/image/t16.c \ +# linux/image/final.c \ +# linux/image/save.c - HEADERS += \ - linux/display.h \ - linux/image.h +# HEADERS += \ +# linux/display.h \ +# linux/image.h - QMAKE_CFLAGS += -pthread +# QMAKE_CFLAGS += -pthread - LIBS += -pthread -lxcb -lxcb-util -lxcb-image -lxcb-shape -lxcb-icccm -lxcb-ewmh -} +# LIBS += -pthread -lxcb -lxcb-util -lxcb-image -lxcb-shape -lxcb-icccm -lxcb-ewmh +# } # OS X -macx { +# macx { -} +# } # Windows win32 { diff --git a/journal/mac/LICENSE b/journal/unix/LICENSE similarity index 100% rename from journal/mac/LICENSE rename to journal/unix/LICENSE diff --git a/journal/mac/images/c1.png b/journal/unix/images/c1.png similarity index 100% rename from journal/mac/images/c1.png rename to journal/unix/images/c1.png diff --git a/journal/mac/images/c2.png b/journal/unix/images/c2.png similarity index 100% rename from journal/mac/images/c2.png rename to journal/unix/images/c2.png diff --git a/journal/mac/images/c3.png b/journal/unix/images/c3.png similarity index 100% rename from journal/mac/images/c3.png rename to journal/unix/images/c3.png diff --git a/journal/mac/images/c4.png b/journal/unix/images/c4.png similarity index 100% rename from journal/mac/images/c4.png rename to journal/unix/images/c4.png diff --git a/journal/mac/images/c5.png b/journal/unix/images/c5.png similarity index 100% rename from journal/mac/images/c5.png rename to journal/unix/images/c5.png diff --git a/journal/mac/images/c6.png b/journal/unix/images/c6.png similarity index 100% rename from journal/mac/images/c6.png rename to journal/unix/images/c6.png diff --git a/journal/mac/images/c7.png b/journal/unix/images/c7.png similarity index 100% rename from journal/mac/images/c7.png rename to journal/unix/images/c7.png diff --git a/journal/mac/images/default.png b/journal/unix/images/default.png similarity index 100% rename from journal/mac/images/default.png rename to journal/unix/images/default.png diff --git a/journal/mac/images/final.png b/journal/unix/images/final.png similarity index 100% rename from journal/mac/images/final.png rename to journal/unix/images/final.png diff --git a/journal/mac/images/niko1.png b/journal/unix/images/niko1.png similarity index 100% rename from journal/mac/images/niko1.png rename to journal/unix/images/niko1.png diff --git a/journal/mac/images/niko2.png b/journal/unix/images/niko2.png similarity index 100% rename from journal/mac/images/niko2.png rename to journal/unix/images/niko2.png diff --git a/journal/mac/images/niko3.png b/journal/unix/images/niko3.png similarity index 100% rename from journal/mac/images/niko3.png rename to journal/unix/images/niko3.png diff --git a/journal/mac/images/s1.png b/journal/unix/images/s1.png similarity index 100% rename from journal/mac/images/s1.png rename to journal/unix/images/s1.png diff --git a/journal/mac/images/s2.png b/journal/unix/images/s2.png similarity index 100% rename from journal/mac/images/s2.png rename to journal/unix/images/s2.png diff --git a/journal/mac/images/s3.png b/journal/unix/images/s3.png similarity index 100% rename from journal/mac/images/s3.png rename to journal/unix/images/s3.png diff --git a/journal/mac/images/s4.png b/journal/unix/images/s4.png similarity index 100% rename from journal/mac/images/s4.png rename to journal/unix/images/s4.png diff --git a/journal/mac/images/save.png b/journal/unix/images/save.png similarity index 100% rename from journal/mac/images/save.png rename to journal/unix/images/save.png diff --git a/journal/mac/images/t1.png b/journal/unix/images/t1.png similarity index 100% rename from journal/mac/images/t1.png rename to journal/unix/images/t1.png diff --git a/journal/mac/images/t10.png b/journal/unix/images/t10.png similarity index 100% rename from journal/mac/images/t10.png rename to journal/unix/images/t10.png diff --git a/journal/mac/images/t11.png b/journal/unix/images/t11.png similarity index 100% rename from journal/mac/images/t11.png rename to journal/unix/images/t11.png diff --git a/journal/mac/images/t12.png b/journal/unix/images/t12.png similarity index 100% rename from journal/mac/images/t12.png rename to journal/unix/images/t12.png diff --git a/journal/mac/images/t13.png b/journal/unix/images/t13.png similarity index 100% rename from journal/mac/images/t13.png rename to journal/unix/images/t13.png diff --git a/journal/mac/images/t14.png b/journal/unix/images/t14.png similarity index 100% rename from journal/mac/images/t14.png rename to journal/unix/images/t14.png diff --git a/journal/mac/images/t15.png b/journal/unix/images/t15.png similarity index 100% rename from journal/mac/images/t15.png rename to journal/unix/images/t15.png diff --git a/journal/mac/images/t16.png b/journal/unix/images/t16.png similarity index 100% rename from journal/mac/images/t16.png rename to journal/unix/images/t16.png diff --git a/journal/mac/images/t2.png b/journal/unix/images/t2.png similarity index 100% rename from journal/mac/images/t2.png rename to journal/unix/images/t2.png diff --git a/journal/mac/images/t3.png b/journal/unix/images/t3.png similarity index 100% rename from journal/mac/images/t3.png rename to journal/unix/images/t3.png diff --git a/journal/mac/images/t4.png b/journal/unix/images/t4.png similarity index 100% rename from journal/mac/images/t4.png rename to journal/unix/images/t4.png diff --git a/journal/mac/images/t5.png b/journal/unix/images/t5.png similarity index 100% rename from journal/mac/images/t5.png rename to journal/unix/images/t5.png diff --git a/journal/mac/images/t6.png b/journal/unix/images/t6.png similarity index 100% rename from journal/mac/images/t6.png rename to journal/unix/images/t6.png diff --git a/journal/mac/images/t7.png b/journal/unix/images/t7.png similarity index 100% rename from journal/mac/images/t7.png rename to journal/unix/images/t7.png diff --git a/journal/mac/images/t8.png b/journal/unix/images/t8.png similarity index 100% rename from journal/mac/images/t8.png rename to journal/unix/images/t8.png diff --git a/journal/mac/images/t9.png b/journal/unix/images/t9.png similarity index 100% rename from journal/mac/images/t9.png rename to journal/unix/images/t9.png diff --git a/journal/mac/journal.py b/journal/unix/journal.py similarity index 100% rename from journal/mac/journal.py rename to journal/unix/journal.py diff --git a/journal/mac/journal.spec b/journal/unix/journal.spec similarity index 100% rename from journal/mac/journal.spec rename to journal/unix/journal.spec diff --git a/journal/mac/qt.conf b/journal/unix/qt.conf similarity index 100% rename from journal/mac/qt.conf rename to journal/unix/qt.conf diff --git a/make-oneshot-mac.command b/make-oneshot-mac.command index bf7aba7..feeb8fe 100755 --- a/make-oneshot-mac.command +++ b/make-oneshot-mac.command @@ -23,7 +23,7 @@ qmake MRIVERSION=2.3 echo "-> ${cyan}Compile engine...${color_reset}" make -j${make_threads} echo "-> ${cyan}Compile journal...${color_reset}" -pyinstaller journal/mac/journal.spec --onefile --windowed +pyinstaller journal/unix/journal.spec --onefile --windowed # Create app bundles echo "-> ${cyan}Create app bundles...${color_reset}" @@ -70,7 +70,7 @@ cp -rf "./_______.app" "$ONESHOT_PATH" # Cleanup echo "-> ${cyan}Cleanup files...${color_reset}" # make clean -rm -rf journal/mac/__pycache__ +rm -rf journal/unix/__pycache__ rm -rf build rm -rf dist