Skip to content

Commit 6370cf2

Browse files
desertkundesertkun
committed
Spectranet(xt) enabled by default
1 parent 5f950d8 commit 6370cf2

6 files changed

Lines changed: 30 additions & 20 deletions

File tree

‎3rdparty/FuseGenerator‎

‎Makefile‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,11 @@ ifneq ($(PROVISIONING_PROFILE_SPECIFIER),)
3434
XCODEBUILD_SIGN_ARGS += PROVISIONING_PROFILE_SPECIFIER="$(PROVISIONING_PROFILE_SPECIFIER)"
3535
endif
3636

37+
all: 3rdparty
38+
39+
fusepb:
40+
cd fusepb && make clean && make
41+
3742
3rdparty: audiofile libgcrypt FuseGenerator FuseImporter mbedtls
3843

3944
audiofile:
@@ -110,7 +115,7 @@ list-teams:
110115
echo "No code signing identities found. Make sure you have certificates installed in your keychain."; \
111116
fi
112117

113-
fusex: 3rdparty
118+
fusex: 3rdparty fusepb
114119
@echo "Building FuseX app..."
115120
cd fusepb && \
116121
xcodebuild -project FuseX.xcodeproj \
@@ -121,7 +126,7 @@ fusex: 3rdparty
121126
CONFIGURATION_BUILD_DIR=build/Deployment \
122127
$(XCODEBUILD_SIGN_ARGS)
123128

124-
archive: 3rdparty
129+
archive: 3rdparty fusepb
125130
@echo "Archiving FuseX app..."
126131
@mkdir -p build
127132
cd fusepb && \

‎fusepb/controllers/PreferencesController.m‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,12 @@ +(void) initialize
9595
- (void)windowDidLoad
9696
{
9797
[super windowDidLoad];
98-
[[self window] setFrameUsingName:@"PreferencesWindow"];
98+
NSWindow *window = [self window];
99+
100+
// Try to restore saved frame, but if it doesn't exist, center the window
101+
if (![window setFrameUsingName:@"PreferencesWindow"]) {
102+
[window center];
103+
}
99104
}
100105

101106
- (void)windowDidMove: (NSNotification *)aNotification
@@ -423,7 +428,7 @@ - (IBAction)massStorageTypeClicked:(id)sender
423428
case 11: // Didaktik 80
424429
settings_current.didaktik80 = 1;
425430
break;
426-
case 12: // Currah µSource
431+
case 12: // Currah µSource
427432
settings_current.usource = 1;
428433
break;
429434
case 13: // DivMMC

‎fusepb/xibs/MainMenu.xib‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -723,7 +723,7 @@
723723
<windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
724724
<windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
725725
<rect key="contentRect" x="496" y="324" width="640" height="480"/>
726-
<rect key="screenRect" x="0.0" y="0.0" width="1728" height="1079"/>
726+
<rect key="screenRect" x="0.0" y="0.0" width="1728" height="1085"/>
727727
<value key="minSize" type="size" width="213" height="107"/>
728728
<view key="contentView" id="878">
729729
<rect key="frame" x="0.0" y="0.0" width="640" height="480"/>

‎fusepb/xibs/Preferences.xib‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,11 @@
3434
<window title="Preferences" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" frameAutosaveName="" animationBehavior="default" id="5" userLabel="Preferences" customClass="NSPanel">
3535
<windowStyleMask key="styleMask" titled="YES" closable="YES"/>
3636
<windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
37-
<rect key="contentRect" x="24" y="202" width="807" height="403"/>
38-
<rect key="screenRect" x="0.0" y="0.0" width="1728" height="1079"/>
37+
<rect key="contentRect" x="24" y="202" width="829" height="403"/>
38+
<rect key="screenRect" x="0.0" y="0.0" width="1728" height="1085"/>
3939
<value key="minSize" type="size" width="213" height="107"/>
4040
<view key="contentView" id="6">
41-
<rect key="frame" x="0.0" y="0.0" width="807" height="403"/>
41+
<rect key="frame" x="0.0" y="0.0" width="829" height="403"/>
4242
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
4343
</view>
4444
<toolbar key="toolbar" implicitIdentifier="2B5EC7EB-5A6C-4F96-8405-91E5B21A019C" allowsUserCustomization="NO" showsBaselineSeparator="NO" displayMode="iconAndLabel" sizeMode="regular" id="1279">
@@ -126,7 +126,7 @@
126126
<outlet property="delegate" destination="-2" id="504"/>
127127
<outlet property="initialFirstResponder" destination="6" id="1305"/>
128128
</connections>
129-
<point key="canvasLocation" x="-451.5" y="133.5"/>
129+
<point key="canvasLocation" x="-440.5" y="133.5"/>
130130
</window>
131131
<customView id="1347" userLabel="General">
132132
<rect key="frame" x="0.0" y="0.0" width="800" height="299"/>
@@ -374,20 +374,20 @@
374374
<point key="canvasLocation" x="114" y="472.5"/>
375375
</customView>
376376
<customView id="jPf-Ep-YVP" userLabel="Debugger">
377-
<rect key="frame" x="0.0" y="0.0" width="800" height="86"/>
377+
<rect key="frame" x="0.0" y="0.0" width="612" height="104"/>
378378
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
379379
<subviews>
380380
<textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="piz-aJ-Ran">
381-
<rect key="frame" x="78" y="34" width="112" height="17"/>
381+
<rect key="frame" x="171" y="30" width="111" height="17"/>
382382
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
383-
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="gdbserver port:" id="nLC-iB-vmm">
383+
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Debugger port:" id="nLC-iB-vmm">
384384
<font key="font" metaFont="system"/>
385385
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
386386
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
387387
</textFieldCell>
388388
</textField>
389389
<textField focusRingType="none" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="eZA-S8-IU4">
390-
<rect key="frame" x="182" y="32" width="215" height="22"/>
390+
<rect key="frame" x="270" y="28" width="170" height="22"/>
391391
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
392392
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" drawsBackground="YES" id="fK9-QT-Ywo">
393393
<numberFormatter key="formatter" formatterBehavior="default10_4" numberStyle="decimal" minimumIntegerDigits="1" maximumIntegerDigits="309" maximumFractionDigits="3" id="cVi-iS-b2v" customClass="NumberFormatter">
@@ -403,9 +403,9 @@
403403
</connections>
404404
</textField>
405405
<button fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="eRR-Dp-5uJ">
406-
<rect key="frame" x="403" y="34" width="318" height="18"/>
406+
<rect key="frame" x="73" y="67" width="464" height="18"/>
407407
<autoresizingMask key="autoresizingMask"/>
408-
<buttonCell key="cell" type="check" title="Enable gdbserver (will disable regular Debugger)" bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2" id="WUN-l9-b03">
408+
<buttonCell key="cell" type="check" title="Enable advanced (gdbserver) debugger (will disable regular Debugger)" bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2" id="WUN-l9-b03">
409409
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
410410
<font key="font" metaFont="system"/>
411411
</buttonCell>
@@ -414,7 +414,7 @@
414414
</connections>
415415
</button>
416416
</subviews>
417-
<point key="canvasLocation" x="-652" y="489"/>
417+
<point key="canvasLocation" x="-746" y="498"/>
418418
</customView>
419419
<customView id="1408" userLabel="Sound">
420420
<rect key="frame" x="0.0" y="0.0" width="800" height="272"/>
@@ -1440,7 +1440,7 @@
14401440
<autoresizingMask key="autoresizingMask"/>
14411441
<clipView key="contentView" id="7ih-tq-3PK">
14421442
<rect key="frame" x="1" y="1" width="135" height="301"/>
1443-
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
1443+
<autoresizingMask key="autoresizingMask"/>
14441444
<subviews>
14451445
<tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnReordering="NO" columnResizing="NO" multipleSelection="NO" emptySelection="NO" autosaveColumns="NO" headerView="1612" id="1615">
14461446
<rect key="frame" x="0.0" y="0.0" width="135" height="284"/>
@@ -1545,7 +1545,7 @@
15451545
<autoresizingMask key="autoresizingMask"/>
15461546
<clipView key="contentView" id="RVo-Sg-mDk">
15471547
<rect key="frame" x="1" y="1" width="135" height="320"/>
1548-
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
1548+
<autoresizingMask key="autoresizingMask"/>
15491549
<subviews>
15501550
<tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnReordering="NO" columnResizing="NO" multipleSelection="NO" emptySelection="NO" autosaveColumns="NO" headerView="1631" id="1634">
15511551
<rect key="frame" x="0.0" y="0.0" width="135" height="303"/>

‎settings.dat‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ fuller, boolean, 0
8181
melodik, boolean, 0
8282
speccyboot, boolean, 0
8383
specdrum, boolean, 0
84-
spectranet, boolean, 0
84+
spectranet, boolean, 1
8585
spectranet_disable, boolean, 0
8686
ttx2000s, boolean, 0
8787
usource, boolean, 0

0 commit comments

Comments
 (0)