From 419632b598b89dc62407ef0e0fb0bddd3864a4ae Mon Sep 17 00:00:00 2001 From: Peter Eszlari Date: Sun, 30 Dec 2018 23:49:54 +0100 Subject: [PATCH 1/2] move olive.icns to packaging/macos --- olive.pro | 2 +- {icons => packaging/macos}/olive.icns | Bin 2 files changed, 1 insertion(+), 1 deletion(-) rename {icons => packaging/macos}/olive.icns (100%) diff --git a/olive.pro b/olive.pro index 1ab9f79e8..33a4e5123 100644 --- a/olive.pro +++ b/olive.pro @@ -196,7 +196,7 @@ win32 { mac { LIBS += -L/usr/local/lib -lavutil -lavformat -lavcodec -lavfilter -lswscale -lswresample - ICON = icons/olive.icns + ICON = packaging/macos/olive.icns INCLUDEPATH = /usr/local/include } diff --git a/icons/olive.icns b/packaging/macos/olive.icns similarity index 100% rename from icons/olive.icns rename to packaging/macos/olive.icns From 8a6af759fd73f3f3667b21e7413a1538eacff272 Mon Sep 17 00:00:00 2001 From: Peter Eszlari Date: Sun, 30 Dec 2018 23:53:53 +0100 Subject: [PATCH 2/2] olive.ico, resources.rc -> packaging/windows --- olive.pro | 2 +- {icons => packaging/windows}/olive.ico | Bin {icons => packaging/windows}/resources.rc | 0 3 files changed, 1 insertion(+), 1 deletion(-) rename {icons => packaging/windows}/olive.ico (100%) rename {icons => packaging/windows}/resources.rc (100%) diff --git a/olive.pro b/olive.pro index 33a4e5123..c4883bf5f 100644 --- a/olive.pro +++ b/olive.pro @@ -190,7 +190,7 @@ HEADERS += \ FORMS += win32 { - RC_FILE = icons/resources.rc + RC_FILE = packaging/windows/resources.rc LIBS += -lavutil -lavformat -lavcodec -lavfilter -lswscale -lswresample -lopengl32 } diff --git a/icons/olive.ico b/packaging/windows/olive.ico similarity index 100% rename from icons/olive.ico rename to packaging/windows/olive.ico diff --git a/icons/resources.rc b/packaging/windows/resources.rc similarity index 100% rename from icons/resources.rc rename to packaging/windows/resources.rc