Skip to content

Commit

Permalink
Bump build + Use MSync
Browse files Browse the repository at this point in the history
  • Loading branch information
IsaacMarovitz committed Oct 11, 2023
1 parent 1d27fe8 commit baf21f7
Show file tree
Hide file tree
Showing 22 changed files with 35 additions and 35 deletions.
16 changes: 8 additions & 8 deletions Whisky.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -947,7 +947,7 @@
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Developer ID Application";
CODE_SIGN_STYLE = Manual;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 28;
CURRENT_PROJECT_VERSION = 29;
DEVELOPMENT_ASSET_PATHS = "\"Whisky/Preview Content\"";
DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=macosx*]" = 92S3SG4PTH;
Expand All @@ -965,7 +965,7 @@
"@executable_path/../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 14.0;
MARKETING_VERSION = 2.0.2;
MARKETING_VERSION = 2.1.0;
PRODUCT_BUNDLE_IDENTIFIER = com.isaacmarovitz.Whisky;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
Expand All @@ -985,7 +985,7 @@
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Developer ID Application";
CODE_SIGN_STYLE = Manual;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 28;
CURRENT_PROJECT_VERSION = 29;
DEVELOPMENT_ASSET_PATHS = "\"Whisky/Preview Content\"";
DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=macosx*]" = 92S3SG4PTH;
Expand All @@ -1003,7 +1003,7 @@
"@executable_path/../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 14.0;
MARKETING_VERSION = 2.0.2;
MARKETING_VERSION = 2.1.0;
PRODUCT_BUNDLE_IDENTIFIER = com.isaacmarovitz.Whisky;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
Expand Down Expand Up @@ -1159,7 +1159,7 @@
CODE_SIGN_ENTITLEMENTS = WhiskyThumbnail/WhiskyThumbnail.entitlements;
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Developer ID Application";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 28;
CURRENT_PROJECT_VERSION = 29;
DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=macosx*]" = 92S3SG4PTH;
ENABLE_HARDENED_RUNTIME = YES;
Expand All @@ -1175,7 +1175,7 @@
"@executable_path/../../../../Frameworks",
);
LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
MARKETING_VERSION = 2.0.2;
MARKETING_VERSION = 2.1.0;
PRODUCT_BUNDLE_IDENTIFIER = com.isaacmarovitz.Whisky.WhiskyThumbnail;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
Expand All @@ -1193,7 +1193,7 @@
CODE_SIGN_ENTITLEMENTS = WhiskyThumbnail/WhiskyThumbnail.entitlements;
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Developer ID Application";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 28;
CURRENT_PROJECT_VERSION = 29;
DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=macosx*]" = 92S3SG4PTH;
ENABLE_HARDENED_RUNTIME = YES;
Expand All @@ -1209,7 +1209,7 @@
"@executable_path/../../../../Frameworks",
);
LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
MARKETING_VERSION = 2.0.2;
MARKETING_VERSION = 2.1.0;
PRODUCT_BUNDLE_IDENTIFIER = com.isaacmarovitz.Whisky.WhiskyThumbnail;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
Expand Down
4 changes: 2 additions & 2 deletions Whisky/Views/Bottle Views/ConfigView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,8 @@ struct ConfigView: View {
}
}
}
Toggle(isOn: $bottle.settings.esync) {
Text("config.esync")
Toggle(isOn: $bottle.settings.msync) {
Text("config.msync")
}
SettingItemView(title: "config.dpi", loadingState: $dpiConfigLoadingState) {
HStack {
Expand Down
2 changes: 1 addition & 1 deletion Whisky/da.lproj/Localizable.strings
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"config.metalTrace" = "Metal Trace";
"config.retinaMode" = "Retina Tilstand";
"config.metalTrace.info" = "Giver dig mulighed for at fange GPU-workload i Xcode";
"config.esync" = "ESync";
"config.msync" = "MSync";
"config.controlPanel" = "Åbn Kontrolpanel";
"config.regedit" = "Åbn Registry Editor";
"config.winecfg" = "Åben Wine Konfiguration";
Expand Down
2 changes: 1 addition & 1 deletion Whisky/de.lproj/Localizable.strings
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"config.metalTrace" = "Metal Trace";
"config.retinaMode" = "Retina-Modus";
"config.metalTrace.info" = "Erlaub es dir, den GPU-Workload in Xcode aufzunehmen";
"config.esync" = "ESync";
"config.msync" = "MSync";
"config.controlPanel" = "Systemsteuerung öffnen";
"config.regedit" = "Registry-Editor öffnen";
"config.winecfg" = "Öffne die Wine-Konfiguration";
Expand Down
2 changes: 1 addition & 1 deletion Whisky/en.lproj/Localizable.strings
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"config.metalTrace" = "Metal Trace";
"config.retinaMode" = "Retina Mode";
"config.metalTrace.info" = "Allows you to capture GPU workload in Xcode";
"config.esync" = "ESync";
"config.msync" = "MSync";
"config.controlPanel" = "Open Control Panel";
"config.regedit" = "Open Registry Editor";
"config.winecfg" = "Open Wine Configuration";
Expand Down
2 changes: 1 addition & 1 deletion Whisky/es.lproj/Localizable.strings
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"config.metalTrace" = "Metal Trace";
"config.retinaMode" = "Modo Retina";
"config.metalTrace.info" = "Permite capturar la carga de trabajo de la GPU en Xcode";
"config.esync" = "ESync";
"config.msync" = "MSync";
"config.controlPanel" = "Abrir Panel de Control";
"config.regedit" = "Abrir Editor de Registro";
"config.winecfg" = "Abrir configuración de Wine";
Expand Down
2 changes: 1 addition & 1 deletion Whisky/fi.lproj/Localizable.strings
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"config.metalTrace" = "Metal Jäljitin";
"config.retinaMode" = "Retina-tila";
"config.metalTrace.info" = "Mahdollistaa GPU työn nappaamisen Xcodessa";
"config.esync" = "ESync";
"config.msync" = "MSync";
"config.controlPanel" = "Avaa ohjauspaneeli";
"config.regedit" = "Avaa rekisterin muokkain";
"config.winecfg" = "Avaa Wine konfiguraatio";
Expand Down
2 changes: 1 addition & 1 deletion Whisky/fr.lproj/Localizable.strings
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"config.metalTrace" = "Trace de Metal";
"config.retinaMode" = "Mode Retina";
"config.metalTrace.info" = "Permet de capturer la charge de travail GPU dans Xcode";
"config.esync" = "ESync";
"config.msync" = "MSync";
"config.controlPanel" = "Ouvrir le Panneau de Configuration";
"config.regedit" = "Ouvrir l'Éditeur de Registre";
"config.winecfg" = "Ouvrir la configuration de Wine";
Expand Down
2 changes: 1 addition & 1 deletion Whisky/it.lproj/Localizable.strings
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"config.metalTrace" = "Metal Trace";
"config.retinaMode" = "Modalità Retina";
"config.metalTrace.info" = "Permette di catturare il carico di lavoro della GPU in Xcode";
"config.esync" = "ESync";
"config.msync" = "MSync";
"config.controlPanel" = "Apri Pannello di Controllo";
"config.regedit" = "Apri Editor dei Registri";
"config.winecfg" = "Apri Configurazione Wine";
Expand Down
2 changes: 1 addition & 1 deletion Whisky/ja.lproj/Localizable.strings
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"config.metalTrace" = "Metal トレース";
"config.retinaMode" = "Retina モード";
"config.metalTrace.info" = "Xcode で GPU ワークロードをキャプチャできるようにします";
"config.esync" = "ESync";
"config.msync" = "MSync";
"config.controlPanel" = "コントロール パネルを開く";
"config.regedit" = "レジストリ エディターを開く";
"config.winecfg" = "Wine 設定を開く";
Expand Down
2 changes: 1 addition & 1 deletion Whisky/ko.lproj/Localizable.strings
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"config.metalTrace" = "Metal Trace";
"config.retinaMode" = "Retina 모드";
"config.metalTrace.info" = "Xcode에서 GPU 워크로드를 확인할 수 있습니다.";
"config.esync" = "ESync";
"config.msync" = "MSync";
"config.controlPanel" = "제어판 열기";
"config.regedit" = "레지스트리 편집기 열기";
"config.winecfg" = "Wine 설정 열기";
Expand Down
2 changes: 1 addition & 1 deletion Whisky/nl.lproj/Localizable.strings
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"config.metalTrace" = "Metal Trace";
"config.retinaMode" = "Retina Modus";
"config.metalTrace.info" = "Maakt GPU werklast captures mogelijk";
"config.esync" = "ESync";
"config.msync" = "MSync";
"config.controlPanel" = "Open configuratiescherm";
"config.regedit" = "Open Register Editor";
"config.winecfg" = "Open Wine Configuratie";
Expand Down
2 changes: 1 addition & 1 deletion Whisky/pl.lproj/Localizable.strings
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"config.metalTrace" = "Śledź Metal";
"config.retinaMode" = "Tryb Retina";
"config.metalTrace.info" = "Umożliwia przechwytywanie obciążenia GPU w Xcode";
"config.esync" = "ESync";
"config.msync" = "MSync";
"config.controlPanel" = "Otwórz Panel Sterowania";
"config.regedit" = "Otwórz edytor rejestru";
"config.winecfg" = "Otwórz konfigurację Wine";
Expand Down
2 changes: 1 addition & 1 deletion Whisky/pt-BR.lproj/Localizable.strings
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"config.metalTrace" = "Diagnóstico Metal";
"config.retinaMode" = "Modo Retina";
"config.metalTrace.info" = "Permite capturar a carga de trabalho da GPU no Xcode";
"config.esync" = "ESync";
"config.msync" = "MSync";
"config.controlPanel" = "Abrir Painel de Controle";
"config.regedit" = "Abrir Editor do Registro";
"config.winecfg" = "Abrir Configuração do Wine";
Expand Down
2 changes: 1 addition & 1 deletion Whisky/pt-PT.lproj/Localizable.strings
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"config.metalTrace" = "Diagnóstico Metal";
"config.retinaMode" = "Modo Retina";
"config.metalTrace.info" = "Permite capturar a carga de trabalho da GPU no Xcode";
"config.esync" = "ESync";
"config.msync" = "MSync";
"config.controlPanel" = "Abrir Painel de Controlo";
"config.regedit" = "Abrir Editor de Registo";
"config.winecfg" = "Abrir Configuração do Wine";
Expand Down
2 changes: 1 addition & 1 deletion Whisky/ru.lproj/Localizable.strings
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"config.metalTrace" = "Трассировка Metal";
"config.retinaMode" = "Режим Retina";
"config.metalTrace.info" = "Позволяет отслеживать рабочую нагрузку видеокарты через Xcode";
"config.esync" = "ESync";
"config.msync" = "MSync";
"config.controlPanel" = "Открыть Панель управления";
"config.regedit" = "Открыть Редактор реестра";
"config.winecfg" = "Открыть конфигурацию Wine";
Expand Down
2 changes: 1 addition & 1 deletion Whisky/tr.lproj/Localizable.strings
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"config.metalTrace" = "Metal İzleme";
"config.retinaMode" = "Retina Modu";
"config.metalTrace.info" = "Xcode'da GPU iş yükünü yakalamak için kullanılır";
"config.esync" = "ESync";
"config.msync" = "MSync";
"config.controlPanel" = "Kontrol Panelini Aç";
"config.regedit" = "Kayıt Düzenleyicisi'ni Aç";
"config.winecfg" = "Wine Yapılandırmasını Aç";
Expand Down
2 changes: 1 addition & 1 deletion Whisky/uk.lproj/Localizable.strings
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"config.metalTrace" = "Metal Trace";
"config.retinaMode" = "Режим Retina";
"config.metalTrace.info" = "Дозволяє вам відстежувати навантаження GPU в Xcode";
"config.esync" = "ESync";
"config.msync" = "MSync";
"config.controlPanel" = "Відкрити Панель Керування";
"config.regedit" = "Відкрити Редактор Реєстру";
"config.winecfg" = "Відкрити налаштування Wine";
Expand Down
2 changes: 1 addition & 1 deletion Whisky/vi.lproj/Localizable.strings
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"config.metalTrace" = "Trace Metal";
"config.retinaMode" = "Chế độ Retina";
"config.metalTrace.info" = "Cho phép lấy thông tin GPU trong Xcode";
"config.esync" = "ESync";
"config.msync" = "MSync";
"config.controlPanel" = "Mở Control Panel";
"config.regedit" = "Mở Regedit";
"config.winecfg" = "Mở cấu hình Wine";
Expand Down
2 changes: 1 addition & 1 deletion Whisky/zh-Hans.lproj/Localizable.strings
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"config.metalTrace" = "Metal 性能分析";
"config.retinaMode" = "Retina 模式";
"config.metalTrace.info" = "允许你在 Xcode 中抓取 GPU 工作负载";
"config.esync" = "ESync(增强同步)";
"config.msync" = "MSync(增强同步)";
"config.controlPanel" = "打开控制面板";
"config.regedit" = "打开注册表编辑器";
"config.winecfg" = "打开 Wine 配置";
Expand Down
2 changes: 1 addition & 1 deletion Whisky/zh-Hant.lproj/Localizable.strings
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"config.metalTrace" = "Metal 追蹤";
"config.retinaMode" = "Retina 模式";
"config.metalTrace.info" = "允許你在 Xcode 中獲取 GPU 工作負載";
"config.esync" = "增強同步 (ESync)";
"config.msync" = "增強同步 (MSync)";
"config.controlPanel" = "開啟控制台";
"config.regedit" = "開啟註冊表編輯器";
"config.winecfg" = "開啟Wine設定";
Expand Down
12 changes: 6 additions & 6 deletions WhiskyKit/Whisky/BottleSettings.swift
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ public struct BottleInfo: Codable {
public struct BottleWineConfig: Codable {
var wineVersion: SemanticVersion = SemanticVersion(7, 7, 0)
var windowsVersion: WinVersion = .win10
var esync: Bool = false
var msync: Bool = true
}

public struct BottleMetalConfig: Codable {
Expand Down Expand Up @@ -115,12 +115,12 @@ public class BottleSettings {
}
}

public var esync: Bool {
public var msync: Bool {
get {
return settings.wineConfig.esync
return settings.wineConfig.msync
}
set {
settings.wineConfig.esync = newValue
settings.wineConfig.msync = newValue
}
}

Expand Down Expand Up @@ -260,8 +260,8 @@ public class BottleSettings {
wineEnv.updateValue("1", forKey: "DXVK_ASYNC")
}

if esync {
wineEnv.updateValue("1", forKey: "WINEESYNC")
if msync {
wineEnv.updateValue("1", forKey: "WINEMSYNC")
}

if metalHud {
Expand Down

0 comments on commit baf21f7

Please sign in to comment.