Skip to content

Commit

Permalink
header path updates
Browse files Browse the repository at this point in the history
  • Loading branch information
chanonly123 committed Feb 5, 2025
1 parent 7749202 commit 2db3c7b
Show file tree
Hide file tree
Showing 15 changed files with 37 additions and 18 deletions.
6 changes: 6 additions & 0 deletions flutter_app/ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,26 @@ PODS:
- path_provider_foundation (0.0.1):
- Flutter
- FlutterMacOS
- permission_handler_apple (9.3.0):
- Flutter

DEPENDENCIES:
- Flutter (from `Flutter`)
- path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`)
- permission_handler_apple (from `.symlinks/plugins/permission_handler_apple/ios`)

EXTERNAL SOURCES:
Flutter:
:path: Flutter
path_provider_foundation:
:path: ".symlinks/plugins/path_provider_foundation/darwin"
permission_handler_apple:
:path: ".symlinks/plugins/permission_handler_apple/ios"

SPEC CHECKSUMS:
Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
path_provider_foundation: 080d55be775b7414fd5a5ef3ac137b97b097e564
permission_handler_apple: 4ed2196e43d0651e8ff7ca3483a069d469701f2d

PODFILE CHECKSUM: 819463e6a0290f5a72f145ba7cde16e8b6ef0796

Expand Down
18 changes: 18 additions & 0 deletions flutter_app/ios/Runner.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -241,6 +241,7 @@
9705A1C41CF9048500538489 /* Embed Frameworks */,
3B06AD1E1E4923F5004D2608 /* Thin Binary */,
8F93C737E9AD0D47B591BC14 /* [CP] Embed Pods Frameworks */,
1340B8F7C3EE3688DB5D47EB /* [CP] Copy Pods Resources */,
);
buildRules = (
);
Expand Down Expand Up @@ -312,6 +313,23 @@
/* End PBXResourcesBuildPhase section */

/* Begin PBXShellScriptBuildPhase section */
1340B8F7C3EE3688DB5D47EB /* [CP] Copy Pods Resources */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-input-files.xcfilelist",
);
name = "[CP] Copy Pods Resources";
outputFileListPaths = (
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-output-files.xcfilelist",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n";
showEnvVarsInLog = 0;
};
1E0A5E8B9B2753B3BB062237 /* [CP] Check Pods Manifest.lock */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
Expand Down
1 change: 0 additions & 1 deletion flutter_app/ios/Runner/AppDelegate.swift
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import UIKit
didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?
) -> Bool {
GeneratedPluginRegistrant.register(with: self)
juceEnableLogs()
Java_com_example_flutter_1app_MyApp_juceMessageManagerInit()
return super.application(application, didFinishLaunchingWithOptions: launchOptions)
}
Expand Down
2 changes: 1 addition & 1 deletion flutter_app/ios/Runner/Runner-Bridging-Header.h
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#import "GeneratedPluginRegistrant.h"
#import "juce_lib.h"
#import "juce_wrapper_c.h"
2 changes: 0 additions & 2 deletions ios_app/ios_app.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -332,7 +332,6 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
HEADER_SEARCH_PATHS = ../juce_lib/includes;
IPHONEOS_DEPLOYMENT_TARGET = 18.0;
LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
Expand Down Expand Up @@ -391,7 +390,6 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
HEADER_SEARCH_PATHS = ../juce_lib/includes;
IPHONEOS_DEPLOYMENT_TARGET = 18.0;
LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
MTL_ENABLE_DEBUG_INFO = NO;
Expand Down
2 changes: 1 addition & 1 deletion ios_app/ios_app/ContentView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ struct ContentView: View {

var body: some View {
// NavigationLink {
PlayerPage(record: true, play: true)
PlayerPage(record: false, play: true)
// } label: {
// Text("ShowPlayer")
// }
Expand Down
2 changes: 1 addition & 1 deletion ios_app/ios_app/bridging.h
Original file line number Diff line number Diff line change
@@ -1 +1 @@
#include <juce_lib.h>
#include "../../modules/juce_mix_player/includes/juce_wrapper_c.h"
4 changes: 2 additions & 2 deletions ios_juce_lib_build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ cp "build/Release/lib${libname}.a" "build/Release-iphonesimulator/${libname}.a"

# create xcframework, with native headers
xcodebuild -create-xcframework \
-library "build/Release-iphoneos/${libname}.a" -headers ../../../$libname/includes \
-library "build/Release-iphonesimulator/${libname}.a" -headers ../../../$libname/includes \
-library "build/Release-iphoneos/${libname}.a" -headers ../../../modules/juce_mix_player/includes \
-library "build/Release-iphonesimulator/${libname}.a" -headers ../../../modules/juce_mix_player/includes \
-output "build/${libname}.xcframework" &&

echo "✅ Build Success ✅"
Expand Down
3 changes: 0 additions & 3 deletions juce_lib/includes/juce_lib.h

This file was deleted.

3 changes: 2 additions & 1 deletion juce_lib/juce_lib.jucer
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
displaySplashScreen="1" jucerFormatVersion="1" defines="JUCE_USE_MP3AUDIOFORMAT=1">
<MAINGROUP id="fjboZk" name="juce_lib">
<GROUP id="{1C9A39F7-F1DF-DAE6-7A86-0D474460ADD4}" name="includes">
<FILE id="P7rO4t" name="juce_lib.h" compile="0" resource="0" file="includes/juce_lib.h"/>
<FILE id="bWxi3Q" name="juce_wrapper_c.h" compile="0" resource="0"
file="../modules/juce_mix_player/includes/juce_wrapper_c.h"/>
</GROUP>
</MAINGROUP>
<MODULES>
Expand Down
2 changes: 1 addition & 1 deletion juce_mix_player_package/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ ffigen:
output: 'lib/juce_lib_gen.dart'
headers:
entry-points:
- '../juce_lib/includes/juce_lib.h'
- '../modules/juce_mix_player/includes/juce_wrapper_c.h'
type-map:
'native-types':
'char':
Expand Down
File renamed without changes.
4 changes: 2 additions & 2 deletions modules/juce_mix_player/juce_wrapper_c.cpp
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
#include "juce_wrapper_c.h"
#include "includes/juce_wrapper_c.h"
#include "Logger.h"
#include "JuceMixPlayer.h"
#include "Models.h"

void Java_com_example_flutter_1app_MyApp_juceMessageManagerInit() {
juce::MessageManager::getInstanceWithoutCreating();
juce::MessageManager::getInstance();
}

// public method to enable/disable logging
Expand Down
2 changes: 1 addition & 1 deletion setup_clean_projects.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
libname="juce_lib"

rm -rf "$libname/Builds"
# rm -rf "$libname/Builds"

# generate native juce projects for iOS and Android
# you can open JuceKit/$libname.jucer using projucer
Expand Down
4 changes: 2 additions & 2 deletions win_setup_clean_projects.bat
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
@echo off
set libname=juce_lib

rem Remove the Builds directory
rmdir /s /q "%libname%\Builds"
:: rem Remove the Builds directory
:: rmdir /s /q "%libname%\Builds"

rem Generate native JUCE projects for iOS and Android
rem You can open JuceKit/%libname%.jucer using Projucer
Expand Down

0 comments on commit 2db3c7b

Please sign in to comment.