Skip to content

Commit

Permalink
Merge branch 'wmoecke-AppleWin-WMoecke'
Browse files Browse the repository at this point in the history 
. PR #285 (Support for TK3000 //e)
  • Loading branch information
@tomcw
tomcw committed Oct 22, 2016
2 parents 5867154 + 86ba0b0 commit 2d61c75
Show file tree
Hide file tree
Showing 18 changed files with 282 additions and 163 deletions.
20 changes: 12 additions & 8 deletions ApplewinExpress10.00.vcxproj
View file
Expand Up @@ -267,6 +267,7 @@
<ClCompile Include="source\Debugger\Debugger_Symbols.cpp" />
<ClCompile Include="source\NTSC.cpp" />
<ClCompile Include="source\NTSC_CharSet.cpp" />
<ClCompile Include="source\SAM.cpp" />
<ClCompile Include="source\StdAfx.cpp">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug NoDX|Win32'">Create</PrecompiledHeader>
Expand Down Expand Up @@ -469,14 +470,6 @@
<ClInclude Include="resource\winres.h" />
</ItemGroup>
<ItemGroup>
<None Include="resource\ApplewinLogo.bmp" />
<None Include="RESOURCE\LED_CAPS_OFF.BMP" />
<None Include="RESOURCE\LED_CAPS_OFF_LAT.BMP" />
<None Include="RESOURCE\LED_CAPS_OFF_P8.BMP" />
<None Include="RESOURCE\LED_CAPS_ON.BMP" />
<None Include="RESOURCE\LED_CAPS_ON_LAT.BMP" />
<None Include="RESOURCE\LED_CAPS_ON_P8.BMP" />
<None Include="RESOURCE\Pravets8M.rom" />
<None Include="source\CPU\cpu_general.inl" />
<None Include="source\CPU\cpu_instructions.inl" />
<None Include="docs\CodingConventions.txt" />
Expand All @@ -491,6 +484,7 @@
<None Include="resource\Apple2e.rom" />
<None Include="resource\Apple2e_Enhanced.rom" />
<None Include="resource\Applewin.bmp" />
<None Include="resource\ApplewinLogo.bmp" />
<None Include="RESOURCE\APPLEWIN.ICO" />
<None Include="RESOURCE\CAPSOFF.BMP" />
<None Include="resource\CAPSOFF_P8.BMP" />
Expand Down Expand Up @@ -518,16 +512,26 @@
<None Include="RESOURCE\HELP.BMP" />
<None Include="resource\LATOFF.BMP" />
<None Include="resource\LATON.BMP" />
<None Include="RESOURCE\LED_CAPS_OFF.BMP" />
<None Include="RESOURCE\LED_CAPS_OFF_LAT.BMP" />
<None Include="RESOURCE\LED_CAPS_OFF_P8.BMP" />
<None Include="RESOURCE\LED_CAPS_ON.BMP" />
<None Include="RESOURCE\LED_CAPS_ON_LAT.BMP" />
<None Include="RESOURCE\LED_CAPS_ON_P8.BMP" />
<None Include="resource\Mockingboard-D.rom" />
<None Include="resource\MouseInterface.rom" />
<None Include="resource\Parallel.rom" />
<None Include="resource\PRAVETS82.ROM" />
<None Include="resource\Pravets8C.rom" />
<None Include="RESOURCE\Pravets8M.rom" />
<None Include="RESOURCE\RUN.BMP" />
<None Include="resource\RUN3000E.bmp" />
<None Include="resource\RUNP.BMP" />
<None Include="RESOURCE\SETUP.BMP" />
<None Include="resource\SSC.rom" />
<None Include="resource\ThunderClockPlus.rom" />
<None Include="resource\TK3000e.rom" />
<None Include="resource\TKClock.rom" />
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="RESOURCE\APPLEWIN.RC">
Expand Down
42 changes: 34 additions & 8 deletions ApplewinExpress10.00.vcxproj.filters
View file
Expand Up @@ -215,6 +215,9 @@
<ClCompile Include="source\NTSC.cpp">
<Filter>Source\Video</Filter>
</ClCompile>
<ClCompile Include="source\SAM.cpp">
<Filter>Source\Emulator</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="source\Applewin.h">
Expand Down Expand Up @@ -501,6 +504,9 @@
<None Include="resource\Applewin.bmp">
<Filter>Resources</Filter>
</None>
<None Include="resource\ApplewinLogo.bmp">
<Filter>Resources</Filter>
</None>
<None Include="RESOURCE\APPLEWIN.ICO">
<Filter>Resources</Filter>
</None>
Expand Down Expand Up @@ -582,6 +588,24 @@
<None Include="resource\LATON.BMP">
<Filter>Resources</Filter>
</None>
<None Include="RESOURCE\LED_CAPS_OFF.BMP">
<Filter>Resources</Filter>
</None>
<None Include="RESOURCE\LED_CAPS_ON.BMP">
<Filter>Resources</Filter>
</None>
<None Include="RESOURCE\LED_CAPS_OFF_P8.BMP">
<Filter>Resources</Filter>
</None>
<None Include="RESOURCE\LED_CAPS_ON_P8.BMP">
<Filter>Resources</Filter>
</None>
<None Include="RESOURCE\LED_CAPS_OFF_LAT.BMP">
<Filter>Resources</Filter>
</None>
<None Include="RESOURCE\LED_CAPS_ON_LAT.BMP">
<Filter>Resources</Filter>
</None>
<None Include="resource\Mockingboard-D.rom">
<Filter>Resources</Filter>
</None>
Expand All @@ -597,9 +621,15 @@
<None Include="resource\Pravets8C.rom">
<Filter>Resources</Filter>
</None>
<None Include="RESOURCE\Pravets8M.rom">
<Filter>Resources</Filter>
</None>
<None Include="RESOURCE\RUN.BMP">
<Filter>Resources</Filter>
</None>
<None Include="resource\RUN3000E.bmp">
<Filter>Resources</Filter>
</None>
<None Include="resource\RUNP.BMP">
<Filter>Resources</Filter>
</None>
Expand All @@ -612,16 +642,12 @@
<None Include="resource\ThunderClockPlus.rom">
<Filter>Resources</Filter>
</None>
<None Include="resource\ApplewinLogo.bmp">
<None Include="resource\TK3000e.rom">
<Filter>Resources</Filter>
</None>
<None Include="resource\TKClock.rom">
<Filter>Resources</Filter>
</None>
<None Include="RESOURCE\LED_CAPS_OFF.BMP" />
<None Include="RESOURCE\LED_CAPS_ON.BMP" />
<None Include="RESOURCE\LED_CAPS_OFF_P8.BMP" />
<None Include="RESOURCE\LED_CAPS_ON_P8.BMP" />
<None Include="RESOURCE\LED_CAPS_OFF_LAT.BMP" />
<None Include="RESOURCE\LED_CAPS_ON_LAT.BMP" />
<None Include="RESOURCE\Pravets8M.rom" />
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="RESOURCE\APPLEWIN.RC">
Expand Down
12 changes: 12 additions & 0 deletions ApplewinExpress9.00.vcproj
View file
Expand Up @@ -1242,6 +1242,10 @@
RelativePath="RESOURCE\RUN.BMP"
>
</File>
<File
RelativePath=".\resource\RUN3000E.BMP"
>
</File>
<File
RelativePath=".\resource\RUNP.BMP"
>
Expand All @@ -1258,6 +1262,14 @@
RelativePath=".\resource\ThunderClockPlus.rom"
>
</File>
<File
RelativePath=".\resource\TK3000e.rom"
>
</File>
<File
RelativePath=".\resource\TKClock.rom"
>
</File>
<File
RelativePath=".\resource\winres.h"
>
Expand Down
3 changes: 3 additions & 0 deletions resource/Applewin.rc
View file
Expand Up @@ -53,6 +53,7 @@ END
FULLSCR_BUTTON BITMAP "FULLSCR.BMP"
RUN_BUTTON BITMAP "RUN.BMP"
RUNP_BUTTON BITMAP "RUNP.BMP"
RUN3000E_BUTTON BITMAP "RUN3000E.BMP"
DEBUG_BUTTON BITMAP "DEBUG.BMP"
DRIVE1_BUTTON BITMAP "DRIVE1.BMP"
DRIVE2_BUTTON BITMAP "DRIVE2.BMP"
Expand Down Expand Up @@ -308,6 +309,7 @@ IDR_PRINTDRVR_FW FIRMWARE "Parallel.rom"
IDR_MOCKINGBOARD_D_FW FIRMWARE "Mockingboard-D.rom"
IDR_MOUSEINTERFACE_FW FIRMWARE "MouseInterface.rom"
IDR_THUNDERCLOCKPLUS_FW FIRMWARE "ThunderClockPlus.rom"
IDR_TKCLOCK_FW FIRMWARE "TKClock.rom"

/////////////////////////////////////////////////////////////////////////////
//
Expand All @@ -321,6 +323,7 @@ IDR_APPLE2E_ENHANCED_ROM ROM "Apple2e_Enhanced.rom"
IDR_PRAVETS_82_ROM ROM "Pravets82.rom"
IDR_PRAVETS_8M_ROM ROM "Pravets8M.rom"
IDR_PRAVETS_8C_ROM ROM "Pravets8C.rom"
IDR_TK3000_2E_ROM ROM "TK3000e.rom"
IDR_FREEZES_F8_ROM ROM "FREEZES_NON-AUTOSTART_F8_ROM.rom"

/////////////////////////////////////////////////////////////////////////////
Expand Down
Binary file added resource/RUN3000E.bmp
View file
Binary file not shown.
Binary file added resource/TK3000e.rom
View file
Binary file not shown.
Binary file added resource/TKClock.rom
View file
Binary file not shown.

0 comments on commit 2d61c75

Please sign in to comment.