From 2a604b81eae87b01ebc57e78c7b189d3e274894a Mon Sep 17 00:00:00 2001 From: ann0see <20726856+ann0see@users.noreply.github.com> Date: Mon, 29 Aug 2022 20:30:10 +0200 Subject: [PATCH] Refactoring: Move platform specific code files to src/ --- Jamulus.pro | 10 +++++----- {android => src/android}/androiddebug.cpp | 0 {ios => src/ios}/ios_app_delegate.h | 0 {ios => src/ios}/ios_app_delegate.mm | 0 {mac => src/mac}/activity.h | 0 {mac => src/mac}/activity.mm | 0 {mac => src/mac}/badgelabel.h | 0 {mac => src/mac}/badgelabel.mm | 0 8 files changed, 5 insertions(+), 5 deletions(-) rename {android => src/android}/androiddebug.cpp (100%) rename {ios => src/ios}/ios_app_delegate.h (100%) rename {ios => src/ios}/ios_app_delegate.mm (100%) rename {mac => src/mac}/activity.h (100%) rename {mac => src/mac}/activity.mm (100%) rename {mac => src/mac}/badgelabel.h (100%) rename {mac => src/mac}/badgelabel.mm (100%) diff --git a/Jamulus.pro b/Jamulus.pro index 04407ed665..70c716b2ba 100644 --- a/Jamulus.pro +++ b/Jamulus.pro @@ -166,8 +166,8 @@ win32 { RC_FILE = mac/mainicon.icns } - HEADERS += mac/activity.h mac/badgelabel.h - OBJECTIVE_SOURCES += mac/activity.mm mac/badgelabel.mm + HEADERS += src/mac/activity.h src/mac/badgelabel.h + OBJECTIVE_SOURCES += src/mac/activity.mm src/mac/badgelabel.mm CONFIG += x86 QMAKE_TARGET_BUNDLE_PREFIX = io.jamulus @@ -220,8 +220,8 @@ win32 { } else:ios { QMAKE_INFO_PLIST = ios/Info.plist - OBJECTIVE_SOURCES += ios/ios_app_delegate.mm - HEADERS += ios/ios_app_delegate.h + OBJECTIVE_SOURCES += src/ios/ios_app_delegate.mm + HEADERS += src/ios/ios_app_delegate.h HEADERS += src/sound/coreaudio-ios/sound.h OBJECTIVE_SOURCES += src/sound/coreaudio-ios/sound.mm QMAKE_TARGET_BUNDLE_PREFIX = io.jamulus @@ -247,7 +247,7 @@ win32 { HEADERS += src/sound/oboe/sound.h SOURCES += src/sound/oboe/sound.cpp \ - android/androiddebug.cpp + src/android/androiddebug.cpp LIBS += -lOpenSLES ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android diff --git a/android/androiddebug.cpp b/src/android/androiddebug.cpp similarity index 100% rename from android/androiddebug.cpp rename to src/android/androiddebug.cpp diff --git a/ios/ios_app_delegate.h b/src/ios/ios_app_delegate.h similarity index 100% rename from ios/ios_app_delegate.h rename to src/ios/ios_app_delegate.h diff --git a/ios/ios_app_delegate.mm b/src/ios/ios_app_delegate.mm similarity index 100% rename from ios/ios_app_delegate.mm rename to src/ios/ios_app_delegate.mm diff --git a/mac/activity.h b/src/mac/activity.h similarity index 100% rename from mac/activity.h rename to src/mac/activity.h diff --git a/mac/activity.mm b/src/mac/activity.mm similarity index 100% rename from mac/activity.mm rename to src/mac/activity.mm diff --git a/mac/badgelabel.h b/src/mac/badgelabel.h similarity index 100% rename from mac/badgelabel.h rename to src/mac/badgelabel.h diff --git a/mac/badgelabel.mm b/src/mac/badgelabel.mm similarity index 100% rename from mac/badgelabel.mm rename to src/mac/badgelabel.mm