Use C99 and Makefile [need feedback] #21

yne · 2022-08-27T18:40:35Z

Migrated C++ to C99, now work with gcc, clang, tcc, chibicc
Use Makefile as build tool and let it handle asset extraction
Allow user custom key-mapping (see: add possibility of change key binding #12)
Add F11 fullscreen toggle (see: Fullscreen Support #22)
Updated README with build examples and new key mapping

Feedbacks :

✔️ Linux ARM64 (Makefile)
✔️ Linux x64 (Makefile)
✔️ Windows + MinGW (Makefile)
✔️ MacOS build (Makefile)
❓ Windows + Visual Studio (vcxproj)

ZachBacon · 2022-08-28T11:29:56Z

Built this locally, and I can say everything does work, including the makefile, even when using a mingw cross compiler, it has my seal of approval, but my approval sadly doesn't matter

ZachBacon · 2022-08-29T03:31:27Z

I can test building with mac tomorrow since I do have a hackintosh system.

keatongreve · 2022-08-30T16:47:50Z

Makefile

+	cd tables; python extract_resources.py ../$(ROM)
+
+clean:
+	$(RM) $(OBJS)


should this also remove executable zelda3 ($TARGET_EXEC)?

and perhaps the tables/generated_* files too

My mistake, I've added the $(TARGET_EXEC) to the clean target. Thanks

I've made a clean_obj and clean_gen both called by clean.
This way, we can fine tune which part shall be cleared.

keatongreve · 2022-08-30T17:19:08Z

Current macOS support is tricky. macOS had separate installations for Python 2.x and 3.x. [System] Python2 has been fully removed on newer versions of macOS, but the python3 executable still resides at /usr/bin/python3. Example fresh-ish (this is my spouse's computer, I haven't done any setup with Xcode, brew, pynv, etc. that I usually do) install below:

keaton@mbp ~ % sw_vers -productVersion 
12.3.1
keaton@mbp ~ % which python
python not found
keaton@mbp ~ % which python3
/usr/bin/python3
keaton@mbp ~ % python3 --version
Python 3.8.9
keaton@mbp ~ %

The obvious local workaround is to replace python with python3 in the make script, and then it worked. I'm not very good with make so I don't have a great idea of how to make this more flexible at the moment. I think developers that typically use python a lot of open source work will be comfortable with brew/pyenv, but we can try not to make that a strict requirement.

keatongreve · 2022-08-30T17:28:09Z

All that being said, when the Python stuff isn't being a hassle, this PR works great. Here's my other machine with a working Brew-installed python in place of /usr/bin/python.

keaton [~] $ openssl dgst -sha256 zelda3.sfc 
SHA256(zelda3.sfc)= 66871d66be19ad2c34c927d6b14cd8eb6fc3181965b6e517cb361f7316009cfb
keaton [~] $ which python
/usr/local/opt/python/libexec/bin/python
keaton [~] $ python --version
Python 3.10.6
keaton [~] $ pip install pillow pyyaml
Requirement already satisfied: pillow in /usr/local/lib/python3.10/site-packages (9.2.0)
Requirement already satisfied: pyyaml in /usr/local/lib/python3.10/site-packages (6.0)
keaton [~] $ git clone git@github.com:yne/zelda3.git && \
>   cd zelda3 && \
>   cp ../zelda3.sfc tables/ && 
>   make
Cloning into 'zelda3'...
[git clone output removed for brevity]
cd tables; python extract_resources.py ../tables/zelda3.sfc
cd tables; python compile_resources.py ../tables/zelda3.sfc
[make output removed for brevity]
keaton [~/zelda3] $ ls -la zelda3
-rwxr-xr-x  1 keaton  staff  2312984 Aug 30 10:25 zelda3
keaton [~/zelda3] $

ZachBacon · 2022-08-30T18:13:35Z

All that being said, when the Python stuff isn't being a hassle, this PR works great. Here's my other machine with a working Brew-installed python in place of /usr/bin/python.

keaton [~] $ openssl dgst -sha256 zelda3.sfc 
SHA256(zelda3.sfc)= 66871d66be19ad2c34c927d6b14cd8eb6fc3181965b6e517cb361f7316009cfb
keaton [~] $ which python
/usr/local/opt/python/libexec/bin/python
keaton [~] $ python --version
Python 3.10.6
keaton [~] $ pip install pillow pyyaml
Requirement already satisfied: pillow in /usr/local/lib/python3.10/site-packages (9.2.0)
Requirement already satisfied: pyyaml in /usr/local/lib/python3.10/site-packages (6.0)
keaton [~] $ git clone git@github.com:yne/zelda3.git && \
>   cd zelda3 && \
>   cp ../zelda3.sfc tables/ && 
>   make
Cloning into 'zelda3'...
[git clone output removed for brevity]
cd tables; python extract_resources.py ../tables/zelda3.sfc
cd tables; python compile_resources.py ../tables/zelda3.sfc
[make output removed for brevity]
keaton [~/zelda3] $ ls -la zelda3
-rwxr-xr-x  1 keaton  staff  2312984 Aug 30 10:25 zelda3
keaton [~/zelda3] $

Pretty much my findings on my hackintosh, once I solved the python issue with brew, it compiled just fine, which is why I suggested a variable for python itself. Which should work on other systems where python 3 may not be default (which is hard to imagine nowadays) or don't rename python3 as python.

yne · 2022-08-30T21:26:05Z

Thanks for the feedbacks.

I've switched python file.py to ./file.py with a #!/usr/bin/env python3 (also had to do a dos2unix conversion). I hope it's makes things easier on MacOS.

I also tested on a rbp4 : the mono threaded DSP+PPU emulation make the game too slow for playing but no glitch was found.

keatongreve · 2022-08-30T22:32:43Z

Makefile

+ROM:=tables/zelda3.sfc
+SRCS:=$(wildcard *.c snes/*.c)
+OBJS:=$(SRCS:%.c=%.o)
+GEN:=$(shell grep -hor tables/generated.*.h --include \*.c)


Should the grep command have a . (for search location) at the end?
$(shell grep -hor tables/generated.*.h --include \*.c .)

Make is hanging after grep: warning: recursive search of stdin on my machine.

keatongreve · 2022-08-30T22:45:24Z

Other than the one comment, changes seem to be working on my end 👍

snesrev · 2022-08-31T00:03:20Z

I don't really like that you add struct in front of every struct name. Would you mind making typedef struct XYZ {} XYZ; instead?

snesrev · 2022-08-31T00:06:26Z

zelda_cpu_infra.c

-  if (which & 256) {
-    if (cmd == kSaveLoad_Save)
-      return;
-    sprintf(name, "saves/ref/%s", kReferenceSaves[which - 256]);


Why did you remove the support for the saves/ref/ files?

snesrev · 2022-08-31T00:07:28Z

main.c

+}
+
+void parseKeyconf(char* buf) {
+  char* names[] = {


I don't like this way of parsing yaml. Why pretend it's yaml when it's not...

Good point. the file resembles an .ini file, would be easier to write and parse that way.

I could rename it to .ini but it's also wont support ini features either

So what shall we keep ? txt ?

…e settings to file Merges PR snesrev#7 and some of PR snesrev#21 (without the move from C/C++ to C99): * Get SDL from Nuget * Makefile * Add F11 as Fullscreen toggle * Handle gamepad and keyconf.yaml mapping * Convert *.py to unix (LF, shebang, +x) Additionally: * Optional autosave on quit, autoload on start * Autozoom to best size for screen, or change zoom manually * Keep proper ratio in fullscreen * Save settings to config.yaml * In addition to key changes from PR snesrev#21 , also: Esc to quit Ctrl+P or Pause/Break to pause +/- to change zoom F11 or Alt+Enter to toggle fullscreen PgUp/PgDn/Home to navigate stages in saves/ref/

keatongreve · 2022-08-31T01:27:12Z

re: the previous comments about struct typedefs, should be resolved by https://github.com/yne/zelda3/pull/1 (@yne feel free to merge or patch manually)

snesrev · 2022-08-31T05:29:02Z

main.c

@@ -52,7 +52,8 @@ int main(int argc, char** argv) {
    printf("Failed to init SDL: %s\n", SDL_GetError());
    return 1;
  }
-  SDL_Window* window = SDL_CreateWindow("Zelda3", SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED, 512, 480, 0);


This patch is not needed cause I added Alt+Enter for fullscreen.

Okay I was not aware of that change. I'll remove it.

@keatongreve

- Tested with gcc, clang, tcc, chibicc - Makefile can handle asset extraction - Ported C++ Save/Load/Patch function in zelda_cpu_infra - Use struct typedef declarations (by @keatongreve) Co-authored-by: Keaton Greve <keatongreve@google.com>

snesrev · 2022-08-31T19:06:34Z

I committed the C++ -> C transition. Please re-submit the other things.

yne · 2022-08-31T19:31:26Z

I just finished rebasing over our previous commit.

This new commit give me even more conflict

yne · 2022-08-31T19:55:36Z

@snesrev : Impressive reverse, and impressive rebase :)

The only missing part I noticed after rebase mine after yours:

Makefile can't handle asset extraction
No key remapping (see .yaml, .ini. .txt debate)
No mention of the "1 dungeon key" patch hotkey
Integrate the number / Ctrl+number in shortcut table

Tell me if you are still interested for a PR for the makefile (the actual one is kinda bloated)

snesrev · 2022-08-31T19:57:02Z

I focused on the C++->C part only. The other things are still interesting but I wasn't sure how to merge your makefile with the current makefile.

snesrev · 2022-08-31T19:59:10Z

I'm also interested in some type of key remapping system.

yne · 2022-08-31T20:03:11Z

Decide the file extension and I'll send the PR ;)

Note that I'll have to move all existing internal shortcut to Ctrl+*
For example E for reset will become Ctrl+E, in case E need to be remapped

snesrev · 2022-08-31T20:05:19Z

I could write an ini-style parser. I don't remember what it looked like but I don't like strstr for parsing.

snesrev · 2022-08-31T20:06:07Z

Reset / E is not important.

yne · 2022-08-31T20:32:03Z

I don't like strstr for parsing.

Totally understandable.

Also the crystal fix 70ba5d1 seems to also have fixed the poly render in intro animation (I guessed this animation style was specific to the US version)

Makefile extraction PR : https://github.com/snesrev/zelda3/pull/31/files?w=1

snesrev · 2022-08-31T22:22:03Z

Hm it doesn't use LTO = -flto=auto though...

snesrev · 2022-08-31T22:23:33Z

.PHONY: clean
-O2
etc

keatongreve reviewed Aug 30, 2022

View reviewed changes

keatongreve mentioned this pull request Aug 30, 2022

Does this project plan to support additional contributors/owners? #26

Closed

keatongreve reviewed Aug 30, 2022

View reviewed changes

snesrev reviewed Aug 31, 2022

View reviewed changes

Migrate to C99 + make

75a58cc

- Tested with gcc, clang, tcc, chibicc - Makefile can handle asset extraction - Ported C++ Save/Load/Patch function in zelda_cpu_infra - Use struct typedef declarations (by @keatongreve) Co-authored-by: Keaton Greve <keatongreve@google.com>

snesrev closed this Aug 31, 2022

keatongreve mentioned this pull request Sep 1, 2022

Need a video tutorial! #23

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Use C99 and Makefile [need feedback] #21

Use C99 and Makefile [need feedback] #21

yne commented Aug 27, 2022 •

edited

ZachBacon commented Aug 28, 2022

ZachBacon commented Aug 29, 2022

keatongreve Aug 30, 2022

keatongreve Aug 30, 2022

yne Aug 30, 2022

keatongreve commented Aug 30, 2022

keatongreve commented Aug 30, 2022

ZachBacon commented Aug 30, 2022

yne commented Aug 30, 2022 •

edited

keatongreve Aug 30, 2022 •

edited

keatongreve commented Aug 30, 2022

snesrev commented Aug 31, 2022

snesrev Aug 31, 2022

snesrev Aug 31, 2022

keatongreve Aug 31, 2022

yne Aug 31, 2022

keatongreve commented Aug 31, 2022

snesrev Aug 31, 2022

yne Aug 31, 2022

snesrev commented Aug 31, 2022

yne commented Aug 31, 2022

yne commented Aug 31, 2022

snesrev commented Aug 31, 2022

snesrev commented Aug 31, 2022

yne commented Aug 31, 2022 •

edited

snesrev commented Aug 31, 2022

snesrev commented Aug 31, 2022

yne commented Aug 31, 2022

snesrev commented Aug 31, 2022

snesrev commented Aug 31, 2022 •

edited

Use C99 and Makefile [need feedback] #21

Use C99 and Makefile [need feedback] #21

Conversation

yne commented Aug 27, 2022 • edited

ZachBacon commented Aug 28, 2022

ZachBacon commented Aug 29, 2022

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

keatongreve commented Aug 30, 2022

keatongreve commented Aug 30, 2022

ZachBacon commented Aug 30, 2022

yne commented Aug 30, 2022 • edited

keatongreve Aug 30, 2022 • edited

Choose a reason for hiding this comment

keatongreve commented Aug 30, 2022

snesrev commented Aug 31, 2022

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

keatongreve commented Aug 31, 2022

Choose a reason for hiding this comment

Choose a reason for hiding this comment

snesrev commented Aug 31, 2022

yne commented Aug 31, 2022

yne commented Aug 31, 2022

snesrev commented Aug 31, 2022

snesrev commented Aug 31, 2022

yne commented Aug 31, 2022 • edited

snesrev commented Aug 31, 2022

snesrev commented Aug 31, 2022

yne commented Aug 31, 2022

snesrev commented Aug 31, 2022

snesrev commented Aug 31, 2022 • edited

yne commented Aug 27, 2022 •

edited

yne commented Aug 30, 2022 •

edited

keatongreve Aug 30, 2022 •

edited

yne commented Aug 31, 2022 •

edited

snesrev commented Aug 31, 2022 •

edited