Skip to content

Commit aaea6be

Browse files
committed
update README.md
updated Makefile targets
1 parent 6f0f5dd commit aaea6be

File tree

3 files changed

+18
-12
lines changed

3 files changed

+18
-12
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ roms
77
.gopher2600/*
88
gopher2600
99
gopher2600.exe
10+
gopher2600_statsview
11+
gopher2600_statsview.exe
1012
*.dot
1113
*.ps
1214
*.pdf

Makefile

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
compileFlags = '-c 3 -B -wb=false'
2-
profilingRom = roms/Pitfall.bin
2+
#profilingRom = roms/Pitfall.bin
3+
profilingRom = "test_roms/plusrom/sokoboo Plus.bin"
34

45
.PHONY: all clean tidy generate check_lint lint check_pandoc readme_spell test race profile profile_display mem_profil_debug build_assertions build release release_statsview check_upx release_upx release_upx_statsview cross_windows cross_windows_statsview cross_windows_static cross_windows_static_statsview check_gotip build_with_gotip
56

@@ -10,6 +11,7 @@ clean:
1011
@echo "removing binary and profiling files"
1112
@rm -f gopher2600 cpu.profile mem.profile debug.cpu.profile debug.mem.profile
1213
@rm -f gopher2600.exe
14+
@rm -f gopher2600_statsview gopher2600_statsview.exe
1315
@find ./ -type f | grep "\.orig" | xargs -r rm
1416

1517
tidy:
@@ -68,13 +70,13 @@ build: generate
6870
go build -gcflags $(compileFlags)
6971

7072
build_statsview: generate
71-
go build -gcflags $(compileFlags) -tags="statsview"
73+
go build -gcflags $(compileFlags) -tags="statsview" -o gopher2600_statsview
7274

7375
release: generate
7476
go build -gcflags $(compileFlags) -ldflags="-s -w" -tags="release"
7577

7678
release_statsview: generate
77-
go build -gcflags $(compileFlags) -tags="release statsview"
79+
go build -gcflags $(compileFlags) -tags="release statsview" -o gopher2600_statsview
7880

7981
check_upx:
8082
ifeq (, $(shell which upx))
@@ -88,22 +90,22 @@ release_upx: check_upx generate
8890
rm gopher2600.upx
8991

9092
release_upx_statsview: check_upx generate
91-
go build -gcflags $(compileFlags) -ldflags="-s -w" -tags="release statsview"
92-
upx -o gopher2600.upx gopher2600
93-
cp gopher2600.upx gopher2600
94-
rm gopher2600.upx
93+
go build -gcflags $(compileFlags) -ldflags="-s -w" -tags="release statsview" -o gopher2600_statsview
94+
upx -o gopher2600_statsview.upx gopher2600_statsview
95+
cp gopher2600_statsview.upx gopher2600_statsview
96+
rm gopher2600_statsview.upx
9597

9698
cross_windows: generate
9799
CGO_ENABLED="1" CC="/usr/bin/x86_64-w64-mingw32-gcc" CXX="/usr/bin/x86_64-w64-mingw32-g++" GOOS="windows" GOARCH="amd64" CGO_LDFLAGS="-lmingw32 -lSDL2" CGO_CFLAGS="-D_REENTRANT" go build -tags "release" -gcflags $(compileFlags) -ldflags="-s -w" .
98100

99101
cross_windows_statsview: generate
100-
CGO_ENABLED="1" CC="/usr/bin/x86_64-w64-mingw32-gcc" CXX="/usr/bin/x86_64-w64-mingw32-g++" GOOS="windows" GOARCH="amd64" CGO_LDFLAGS="-lmingw32 -lSDL2" CGO_CFLAGS="-D_REENTRANT" go build -tags "release statsview" -gcflags $(compileFlags) -ldflags="-s -w" .
102+
CGO_ENABLED="1" CC="/usr/bin/x86_64-w64-mingw32-gcc" CXX="/usr/bin/x86_64-w64-mingw32-g++" GOOS="windows" GOARCH="amd64" CGO_LDFLAGS="-lmingw32 -lSDL2" CGO_CFLAGS="-D_REENTRANT" go build -tags "release statsview" -gcflags $(compileFlags) -ldflags="-s -w" -o gopher2600_statsview.exe .
101103

102104
cross_windows_static: generate
103105
CGO_ENABLED="1" CC="/usr/bin/x86_64-w64-mingw32-gcc" CXX="/usr/bin/x86_64-w64-mingw32-g++" GOOS="windows" GOARCH="amd64" CGO_LDFLAGS="-static-libgcc -static-libstdc++" go build -tags "static release" -gcflags $(compileFlags) -ldflags "-s -w" .
104106

105107
cross_windows_static_statsview: generate
106-
CGO_ENABLED="1" CC="/usr/bin/x86_64-w64-mingw32-gcc" CXX="/usr/bin/x86_64-w64-mingw32-g++" GOOS="windows" GOARCH="amd64" CGO_LDFLAGS="-static-libgcc -static-libstdc++" go build -tags "static release statsview" -gcflags $(compileFlags) -ldflags "-s -w" .
108+
CGO_ENABLED="1" CC="/usr/bin/x86_64-w64-mingw32-gcc" CXX="/usr/bin/x86_64-w64-mingw32-g++" GOOS="windows" GOARCH="amd64" CGO_LDFLAGS="-static-libgcc -static-libstdc++" go build -tags "static release statsview" -gcflags $(compileFlags) -ldflags "-s -w" -o gopher2600_statsview.exe .
107109

108110
check_gotip:
109111
ifeq (, $(shell which gotip))

README.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -482,9 +482,9 @@ The `DPC+` is supported but the emulator does not currently emulate the `ARM7` p
482482
Playmode and debug mode can both be launched with a statistics viewer available
483483
locally on your machine `localhost:12600/debug/statsview`.
484484

485-
> gopher2600 -statsserver <rom>
485+
> gopher2600 -statsview <rom>
486486

487-
> gopher2600 debug -statsserver <rom>
487+
> gopher2600 debug -statsview <rom>
488488

489489
The screen below shows an example of the available statistics. In this
490490
instance, this is the debugger running a 4k Atari cartridge (specifically,
@@ -496,6 +496,8 @@ For people who really want to dig deep into the running program,
496496
`localhost:12600/debug/pprof/` gives more raw, but still useful
497497
information.
498498

499+
Note that this feature requires you run a suitably compiled executable.
500+
499501
## Gopher2600 Tools
500502

501503
See the https://github.com/JetSetIlly/Gopher2600-Utils/ repository for examples of tools
@@ -578,7 +580,7 @@ The following projects are used in the `Gopher2600` project:
578580
* https://github.com/hajimehoshi/go-mp3
579581
* https://github.com/pkg/term
580582

581-
Stats server provided by:
583+
Statsview provided by:
582584

583585
* https://github.com/go-echarts/statsview
584586

0 commit comments

Comments
 (0)