Skip to content

Commit 871827b

Browse files
ejaquayejaquay
authored andcommitted
FD502 restore floppy becker config items
COMBINE_BECKER macro affects rc file. Macro will be removed in the future. Added back to fd502.h and fd502.rc for temporary fix. Increased value of MAX_LOADSTRING
1 parent 771790c commit 871827b

File tree

4 files changed

+12
-6
lines changed

4 files changed

+12
-6
lines changed

FD502/fd502.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@ extern void*const& gHostKey;
2323
extern PakAssertInteruptHostCallback AssertInt;
2424
void BuildCartridgeMenu();
2525

26+
// DO NOT REMOVE until becker.dll is retired. Then FD502 becker becomes permanant.
27+
#define COMBINE_BECKER
28+
2629
// FIXME: These need to be turned into a scoped enum and the signature of functions
2730
// that use them updated.
2831
#define External 0

FD502/fd502.rc

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,9 @@ END
5555
// Dialog
5656
//
5757

58+
// DO NOT REMOVE until becker.dll is retired. Then FD502 becker becomes permanant.
59+
#define COMBINE_BECKER
60+
5861
IDD_CONFIG DIALOGEX 0, 0, 268, 185
5962
STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
6063
CAPTION "Floppy Configuration"
@@ -198,7 +201,7 @@ STRINGTABLE
198201
BEGIN
199202
IDS_MODULE_NAME "FD-502"
200203
IDS_VERSION "3.0.1"
201-
IDS_DESCRIPTION "Turn any Color Computer with Extended BASIC into a disk system. Write your own disk applications or add ready-to-run software. Plugs into the Program Pak port or Multi-Pak Interface."
204+
IDS_DESCRIPTION "Emulate FD502 floppy controller with four floppy drives. Loads Disk Extended Color Basic (disl11.rom) or user selectable disk rom. Also includes Becker Port for communicating with Drivewire and a Disto Clock for use with OS-9. Uses SCS selectable disk ports. Plugs into the Program Pak port or Multi-Pak Interface."
202205
#ifdef COMBINE_BECKER
203206
IDS_CATNUMBER "+ Becker"
204207
#else

FD502/fd502.vcxproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
6363
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
6464
<ClCompile>
65-
<PreprocessorDefinitions>WIN32;COMBINE_BECKER;fd502_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
65+
<PreprocessorDefinitions>WIN32;fd502_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
6666
</ClCompile>
6767
<ResourceCompile />
6868
<Link>
@@ -72,7 +72,7 @@
7272
</ItemDefinitionGroup>
7373
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Legacy|Win32'">
7474
<ClCompile>
75-
<PreprocessorDefinitions>WIN32;COMBINE_BECKER;_USRDLL;fd502_EXPORTS;_LEGACY_VCC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
75+
<PreprocessorDefinitions>WIN32;_USRDLL;fd502_EXPORTS;_LEGACY_VCC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
7676
<AdditionalOptions>/arch:SSE</AdditionalOptions>
7777
</ClCompile>
7878
<ResourceCompile>
@@ -86,7 +86,7 @@
8686
</ItemDefinitionGroup>
8787
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
8888
<ClCompile>
89-
<PreprocessorDefinitions>WIN32;COMBINE_BECKER;fd502_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
89+
<PreprocessorDefinitions>WIN32;fd502_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
9090
<AdditionalOptions>/arch:SSE</AdditionalOptions>
9191
</ClCompile>
9292
<ResourceCompile />
@@ -121,4 +121,4 @@
121121
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
122122
<ImportGroup Label="ExtensionTargets">
123123
</ImportGroup>
124-
</Project>
124+
</Project>

libcommon/include/vcc/core/limits.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,4 @@
1818
#pragma once
1919

2020

21-
constexpr auto MAX_LOADSTRING = 200u;
21+
constexpr auto MAX_LOADSTRING = 400u;

0 commit comments

Comments
 (0)