Packaging Clean-up - Githubissues

riksweeney / edgar

A 2D platform game with a persistent world. When Edgar's father fails to return home after venturing out one dark and stormy night, Edgar fears the worst: he has been captured by the evil sorcerer who lives in a fortress beyond the forbidden swamp.

https://www.parallelrealities.co.uk/games/edgar

116 stars 28 forks source link

Packaging Clean-up #17

Closed misterhat closed 8 years ago

misterhat commented 8 years ago

Updated the manpage to follow more traditional formatting.
Updated the desktop file to include Categories and to remove the deprecated Encoding key.
Updated src/system/pak.c to use the existence of PAK_FILE rather than DEV.
Updated the makefile to remove hard-coding of gcc, add support for external CFLAGS and the ability to toggle the pak file (needed for packaging).

These are changes I've patched in the Debian version, but it would be great to have it in upstream to simplify the source package.

riksweeney commented 8 years ago

I don't like that NO_PAK is set to 1 if DEV is set to 0. This mean I have to update the other makefiles and scripts to accommodate that change, or they'll all be out of sync. The rest of the changes look fine.

misterhat commented 8 years ago

How's this?

riksweeney commented 8 years ago

This merge actually fails to compile using the default makefile (src/system/pak.c:175:3: error: ISO C90 forbids mixed declarations and code [-Werror=pedantic]). This occurs in various places.

The indentation of the changed lines is all over the place as well.

I'll clean it up and see if I can get it working. If I can't then I'll have to revert the change.

misterhat commented 8 years ago

Sorry, it looks like some of the lines used 8 spaces while others used \t. I'm not sure about the mixed declarations though, gcc never returned any errors using the same makefile. I did remove the cc declaration in the makefile so it may not be using gcc if it isn't your default CC. Thanks for the merge.

EDIT: I tried compiling the game using clang and it worked fine as well. Even with -std=c89 the game still compiles and runs correctly. I hope the issue was just with the tabbing.