Skip to content

Commit

Permalink
Use submodules for apple2shader and cpu6502 (#202)
Browse files Browse the repository at this point in the history
* Use submodules for apple2shader and cpu6502

* Update instructions
  • Loading branch information
whscullin authored Nov 23, 2023
1 parent eab7de7 commit e789111
Show file tree
Hide file tree
Showing 30 changed files with 3,299 additions and 6,170 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/nodejs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ jobs:

steps:
- uses: actions/checkout@v2
with:
submodules: "true"
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
with:
Expand Down
6 changes: 6 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
[submodule "submodules/cpu6502"]
path = submodules/cpu6502
url = https://github.com/whscullin/cpu6502
[submodule "submodules/apple2shader"]
path = submodules/apple2shader
url = https://github.com/whscullin/apple2shader
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ Things are still a little rough around the edges right now, hopefully I will hav
First

```sh
git submodule init
sit submodule update
npm install
```

Expand Down
5 changes: 3 additions & 2 deletions js/apple2.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,12 @@ import {
} from './gl';
import ROM from './roms/rom';
import { Apple2IOState } from './apple2io';
import CPU6502, {
import {
CPU6502,
CpuState,
FLAVOR_6502,
FLAVOR_ROCKWELL_65C02,
} from './cpu6502';
} from '@whscullin/cpu6502';
import MMU, { MMUState } from './mmu';
import RAM, { RAMState } from './ram';

Expand Down
2 changes: 1 addition & 1 deletion js/apple2io.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import CPU6502 from './cpu6502';
import { CPU6502 } from '@whscullin/cpu6502';
import { Card, Memory, MemoryPages, TapeData, byte, Restorable } from './types';
import { debug, garbage } from './util';
import { VideoModes } from './videomodes';
Expand Down
2 changes: 1 addition & 1 deletion js/cards/mouse.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Card, byte, word, Restorable } from '../types';
import CPU6502, { CpuState } from '../cpu6502';
import { CPU6502, CpuState } from '@whscullin/cpu6502';
import { debug } from '../util';
import { rom } from '../roms/cards/mouse';

Expand Down
2 changes: 1 addition & 1 deletion js/cards/smartport.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { debug, toHex } from '../util';
import { rom as smartPortRom } from '../roms/cards/smartport';
import { Card, Restorable, byte, word, rom } from '../types';
import { MassStorage, BlockDisk, ENCODING_BLOCK, BlockFormat, MassStorageData, DiskFormat } from '../formats/types';
import CPU6502, { CpuState, flags } from '../cpu6502';
import { CPU6502, CpuState, flags } from '@whscullin/cpu6502';
import { create2MGFromBlockDisk, HeaderData, read2MGHeader } from '../formats/2mg';
import createBlockDisk from '../formats/block';
import { DriveNumber } from '../formats/types';
Expand Down
2 changes: 1 addition & 1 deletion js/components/Drives.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import Disk2, { Callbacks } from '../cards/disk2';
import Apple2IO from '../apple2io';
import { DiskII, DiskIIData } from './DiskII';
import SmartPort from 'js/cards/smartport';
import CPU6502 from 'js/cpu6502';
import { CPU6502 } from '@whscullin/cpu6502';
import { BlockDisk } from './BlockDisk';
import { ErrorModal } from './ErrorModal';
import { ProgressModal } from './ProgressModal';
Expand Down
2 changes: 1 addition & 1 deletion js/components/LanguageCard.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import CPU6502 from 'js/cpu6502';
import { CPU6502 } from '@whscullin/cpu6502';
import { Memory } from 'js/types';
import { useEffect } from 'preact/hooks';
import Apple2IO, { slot } from '../apple2io';
Expand Down
2 changes: 1 addition & 1 deletion js/components/Mouse.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { RefObject } from 'preact';
import Apple2IO, { slot } from '../apple2io';
import { MouseUI } from '../ui/mouse';
import MouseCard from '../cards/mouse';
import CPU6502 from '../cpu6502';
import { CPU6502 } from '@whscullin/cpu6502';
import { useEffect } from 'preact/hooks';

/**
Expand Down
Loading

0 comments on commit e789111

Please sign in to comment.