Skip to content

Commit

Permalink
feat: give darwin its own variable
Browse files Browse the repository at this point in the history
  • Loading branch information
GeopJr committed Feb 20, 2024
1 parent c5625d4 commit 9d09201
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 3 deletions.
4 changes: 3 additions & 1 deletion meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,11 @@ if devmode
add_project_arguments(['--define=DEV_MODE'], language: 'vala')
endif

if host_machine.system() == 'windows' or host_machine.system() == 'darwin'
if host_machine.system() == 'windows'
add_project_arguments(['--define=WINDOWS'], language: 'vala')
add_project_arguments('-mwindows', language: 'c')
elif host_machine.system() == 'darwin'
add_project_arguments(['--define=DARWIN'], language: 'vala')
endif

add_project_arguments(['--vapidir=' + meson.project_source_root() / 'vapi'], language: 'vala')
Expand Down
2 changes: 1 addition & 1 deletion src/Application.vala
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ namespace Tuba {
Intl.textdomain (Build.GETTEXT_PACKAGE);

GLib.Environment.unset_variable ("GTK_THEME");
#if WINDOWS
#if WINDOWS || DARWIN
GLib.Environment.set_variable ("SECRET_BACKEND", "file", false);
if (GLib.Environment.get_variable ("SECRET_BACKEND") == "file")
GLib.Environment.set_variable ("SECRET_FILE_TEST_PASSWORD", @"$(GLib.Environment.get_user_name ())$(Build.DOMAIN)", false);
Expand Down
2 changes: 1 addition & 1 deletion src/Dialogs/NewAccount.vala
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ public class Tuba.Dialogs.NewAccount: Adw.Window {

const string SCOPES = "read write follow";

#if WINDOWS
#if WINDOWS || DARWIN
const bool SHOULD_AUTO_AUTH = false;
#else
const bool SHOULD_AUTO_AUTH = true;
Expand Down

0 comments on commit 9d09201

Please sign in to comment.