Skip to content

Commit

Permalink
fix osx warnings, try fix osx analytics loop on crash
Browse files Browse the repository at this point in the history
  • Loading branch information
@benkuper
benkuper committed Jun 29, 2024
1 parent df0140d commit 6f27c67
Show file tree
Hide file tree
Showing 18 changed files with 2,070 additions and 2,042 deletions.
44 changes: 26 additions & 18 deletions Builds/MacOSX/Chataigne.xcodeproj/project.pbxproj
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Builds/MacOSX/Chataigne.xcodeproj/xcshareddata/xcschemes/Chataigne - App.xcscheme
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
</Testables>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
buildConfiguration = "DebugSilicon"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
Expand Down
6 changes: 4 additions & 2 deletions Builds/MacOSX_CI/Chataigne.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3693,6 +3693,7 @@
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
CODE_SIGN_IDENTITY = "";
DEBUG_INFORMATION_FORMAT = dwarf;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = NO;
Expand Down Expand Up @@ -3741,6 +3742,7 @@
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
CODE_SIGN_IDENTITY = "";
DEBUG_INFORMATION_FORMAT = dwarf;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = NO;
Expand Down Expand Up @@ -3773,6 +3775,7 @@
CLANG_CXX_LANGUAGE_STANDARD = "c++17";
CLANG_CXX_LIBRARY = "libc++";
CLANG_LINK_OBJC_RUNTIME = NO;
CODE_SIGN_IDENTITY = "";
COMBINE_HIDPI_IMAGES = YES;
CONFIGURATION_BUILD_DIR = "$(SRCROOT)/../../Release";
DEAD_CODE_STRIPPING = YES;
Expand All @@ -3788,7 +3791,6 @@
"JUCE_COREGRAPHICS_DRAW_ASYNC=1",
"USE_ABLETONLINK=1",
"LINK_PLATFORM_MACOSX=1",
"OS_SYSINFO_SUPPORT=0",
"JUCER_XCODE_MAC_2F3811D6=1",
"JUCE_APP_VERSION=1.9.19",
"JUCE_APP_VERSION_HEX=0x10913",
Expand Down Expand Up @@ -3855,6 +3857,7 @@
CLANG_CXX_LANGUAGE_STANDARD = "c++17";
CLANG_CXX_LIBRARY = "libc++";
CLANG_LINK_OBJC_RUNTIME = NO;
CODE_SIGN_IDENTITY = "";
COMBINE_HIDPI_IMAGES = YES;
CONFIGURATION_BUILD_DIR = "$(SRCROOT)/../../Release";
DEAD_CODE_STRIPPING = YES;
Expand All @@ -3870,7 +3873,6 @@
"JUCE_COREGRAPHICS_DRAW_ASYNC=1",
"USE_ABLETONLINK=1",
"LINK_PLATFORM_MACOSX=1",
"OS_SYSINFO_SUPPORT=0",
"JUCER_XCODE_MAC_2F3811D6=1",
"JUCE_APP_VERSION=1.9.19",
"JUCE_APP_VERSION_HEX=0x10913",
Expand Down
1,462 changes: 730 additions & 732 deletions Builds/VisualStudio2022/Chataigne_App.vcxproj
View file

Large diffs are not rendered by default.

1,506 changes: 753 additions & 753 deletions Builds/VisualStudio2022/Chataigne_App.vcxproj.filters
View file

Large diffs are not rendered by default.

4 changes: 1 addition & 3 deletions Builds/VisualStudio2022_CI/Chataigne_App.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2927,9 +2927,7 @@
<ClCompile Include="..\..\JuceLibraryCode\include_juce_dmx.cpp"/>
<ClCompile Include="..\..\JuceLibraryCode\include_juce_dsp.cpp"/>
<ClCompile Include="..\..\JuceLibraryCode\include_juce_events.cpp"/>
<ClCompile Include="..\..\JuceLibraryCode\include_juce_graphics.cpp">
<AdditionalOptions> /bigobj %(AdditionalOptions)</AdditionalOptions>
</ClCompile>
<ClCompile Include="..\..\JuceLibraryCode\include_juce_graphics.cpp"/>
<ClCompile Include="..\..\JuceLibraryCode\include_juce_gui_basics.cpp">
<AdditionalOptions> /bigobj %(AdditionalOptions)</AdditionalOptions>
</ClCompile>
Expand Down
4 changes: 1 addition & 3 deletions Builds/VisualStudio2022_Win7CI/Chataigne_App.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2926,9 +2926,7 @@
<ClCompile Include="..\..\JuceLibraryCode\include_juce_dmx.cpp"/>
<ClCompile Include="..\..\JuceLibraryCode\include_juce_dsp.cpp"/>
<ClCompile Include="..\..\JuceLibraryCode\include_juce_events.cpp"/>
<ClCompile Include="..\..\JuceLibraryCode\include_juce_graphics.cpp">
<AdditionalOptions> /bigobj %(AdditionalOptions)</AdditionalOptions>
</ClCompile>
<ClCompile Include="..\..\JuceLibraryCode\include_juce_graphics.cpp"/>
<ClCompile Include="..\..\JuceLibraryCode\include_juce_gui_basics.cpp">
<AdditionalOptions> /bigobj %(AdditionalOptions)</AdditionalOptions>
</ClCompile>
Expand Down
2 changes: 1 addition & 1 deletion Chataigne.jucer
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1875,7 +1875,7 @@
smallIcon="nVz6Li" bigIcon="nVz6Li" hardenedRuntimeOptions="com.apple.security.cs.allow-jit"
customPList="&lt;plist&gt;&#10;&lt;dict&gt;&#10;&lt;key&gt;NSAppTransportSecurity&lt;/key&gt;&#10;&#9;&lt;dict&gt;&#10;&#9;&#9;&lt;key&gt;NSAllowsArbitraryLoads&lt;/key&gt;&#10;&#9;&#9;&lt;true/&gt;&#10;&#9;&lt;/dict&gt;&#10;&lt;/dict&gt;&#10;&lt;/plist&gt;"
microphonePermissionNeeded="1" extraFrameworks="IOBluetooth, ForceFeedback, IOKit"
documentExtensions="noisette" extraDefs="JUCE_SUPPORT_CARBON=0&#10;JUCE_COREGRAPHICS_DRAW_ASYNC=1&#10;USE_ABLETONLINK=1&#10;LINK_PLATFORM_MACOSX=1&#10;OS_SYSINFO_SUPPORT=0"
documentExtensions="noisette" extraDefs="JUCE_SUPPORT_CARBON=0&#10;JUCE_COREGRAPHICS_DRAW_ASYNC=1&#10;USE_ABLETONLINK=1&#10;LINK_PLATFORM_MACOSX=1"
xcodeValidArchs="arm64,x86_64" frameworkSearchPaths="../../External/sdl/lib/osx"
embeddedFrameworks="../../External/sdl/lib/osx/SDL2.framework">
<CONFIGURATIONS>
Expand Down
24 changes: 12 additions & 12 deletions External/posistagenet/include/psn_encoder_impl.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,13 +97,13 @@ encode_info( const tracker_map & trackers , uint64_t timestamp_usec )
break ;
}

tracker_chunk->data_len = packet.buffer - ( (char *)tracker_chunk + sizeof( chunk_header ) ) ;
tracker_chunk->data_len = (uint32_t)(packet.buffer - ( (char *)tracker_chunk + sizeof( chunk_header ) )) ;
tracker_list_chunk->data_len += tracker_chunk->data_len + sizeof( chunk_header ) ;

++tracker_it ;
}

main_chunk->data_len = packet.buffer - ( buffer + sizeof( chunk_header ) ) ;
main_chunk->data_len = (uint32_t)(packet.buffer - ( buffer + sizeof( chunk_header ) )) ;

packets.push_back( ::std::string( buffer , MAX_UDP_PACKET_SIZE - packet.size ) ) ;
}
Expand Down Expand Up @@ -161,24 +161,24 @@ encode_data( const tracker_map & trackers , uint64_t timestamp_usec )
}

// Tracker fields
if ( tracker.is_pos_set() && !fill_tracker_field( packet , DATA_TRACKER_POS , tracker.get_pos() ) ||
tracker.is_speed_set() && !fill_tracker_field( packet , DATA_TRACKER_SPEED , tracker.get_speed() ) ||
tracker.is_ori_set() && !fill_tracker_field( packet , DATA_TRACKER_ORI , tracker.get_ori() ) ||
tracker.is_status_set() && !fill_tracker_field( packet , DATA_TRACKER_STATUS , tracker.get_status() ) ||
tracker.is_accel_set() && !fill_tracker_field( packet , DATA_TRACKER_ACCEL , tracker.get_accel() ) ||
tracker.is_target_pos_set() && !fill_tracker_field( packet , DATA_TRACKER_TRGTPOS , tracker.get_target_pos() ) ||
tracker.is_timestamp_set() && !fill_tracker_field( packet , DATA_TRACKER_TIMESTAMP , tracker.get_timestamp() ) )
if ( (tracker.is_pos_set() && !fill_tracker_field( packet , DATA_TRACKER_POS , tracker.get_pos() )) ||
(tracker.is_speed_set() && !fill_tracker_field( packet , DATA_TRACKER_SPEED , tracker.get_speed() )) ||
(tracker.is_ori_set() && !fill_tracker_field( packet , DATA_TRACKER_ORI , tracker.get_ori() ) )||
(tracker.is_status_set() && !fill_tracker_field( packet , DATA_TRACKER_STATUS , tracker.get_status() )) ||
(tracker.is_accel_set() && !fill_tracker_field( packet , DATA_TRACKER_ACCEL , tracker.get_accel() )) ||
(tracker.is_target_pos_set() && !fill_tracker_field( packet , DATA_TRACKER_TRGTPOS , tracker.get_target_pos() )) ||
(tracker.is_timestamp_set() && !fill_tracker_field( packet , DATA_TRACKER_TIMESTAMP , tracker.get_timestamp() )))
{
packet = backup_packet ;
break ;
}

tracker_chunk->data_len = packet.buffer - ( (char *)tracker_chunk + sizeof( chunk_header ) ) ;
tracker_chunk->data_len = (uint32_t) (packet.buffer - ( (char *)tracker_chunk + sizeof( chunk_header ) )) ;
tracker_list_chunk->data_len += tracker_chunk->data_len + sizeof( chunk_header ) ;
++tracker_it ;
}

main_chunk->data_len = packet.buffer - ( buffer + sizeof( chunk_header ) ) ;
main_chunk->data_len = (uint32_t) (packet.buffer - ( buffer + sizeof( chunk_header ) )) ;

packets.push_back( ::std::string( buffer , MAX_UDP_PACKET_SIZE - packet.size ) ) ;
}
Expand All @@ -203,7 +203,7 @@ fill_chunk_header( packet_t & packet , uint16_t id , bool has_subchunks , size_t

chunk->id = id ;
chunk->has_subchunks = has_subchunks ? 1 : 0 ;
chunk->data_len = data_len ;
chunk->data_len = (uint32_t)data_len ;
packet.apply_offset( sizeof( chunk_header ) ) ;

return chunk ;
Expand Down
25 changes: 24 additions & 1 deletion JuceLibraryCode/AppConfig.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,30 @@

// [END_USER_CODE_SECTION]

#define JUCE_PROJUCER_VERSION 0x80000
/*
==============================================================================
In accordance with the terms of the JUCE 7 End-Use License Agreement, the
JUCE Code in SECTION A cannot be removed, changed or otherwise rendered
ineffective unless you have a JUCE Indie or Pro license, or are using JUCE
under the GPL v3 license.
End User License Agreement: www.juce.com/juce-7-licence
==============================================================================
*/

// BEGIN SECTION A

#ifndef JUCE_DISPLAY_SPLASH_SCREEN
#define JUCE_DISPLAY_SPLASH_SCREEN 0
#endif

// END SECTION A

#define JUCE_USE_DARK_SPLASH_SCREEN 1

#define JUCE_PROJUCER_VERSION 0x7000c

//==============================================================================
#define JUCE_MODULE_AVAILABLE_juce_audio_basics 1
Expand Down
Loading

0 comments on commit 6f27c67

Please sign in to comment.