Merged
Conversation
These modifications have mostly been made with an eye to incorporating new targets in the Makefile in the future, for example a new target which allows one to compile a python-interface Lime.
- lime script: added another command-line flag -t to invoke a test compilation (what used to be accomplished by un-commenting the relevant lines of the Makefile).
- lime script: passes -s to Makefile (replaces .SILENT target in Makefile).
- Added a Makefile.defs to list all the source files (*.c and *.h).
- Makefile: added more path variables to replace hardwired src, doc etc.
- Makefile: Added the remaining non-file targets to .PHONY.
- Makefile: target 'all' seemed to be wrongly placed, with a tab character after target .PHONY rather than a newline. This has been fixed.
- Makefile: the object files now have the include files as prerequisites. (This could be done in a more targeted way, because not every object file depends on every include, but I will leave that for now.)
- Makefile: the previous ${OBS}-tied implicit rule has been replaced by a simple free-standing one.
- The global variable 'silent' had not been declared extern in lime.h or properly defined elsewhere. This caused a compiler error on MacOS. Thus 'extern' is now added to the lime.h declaration and it is defined via 'int silent=0' in file-scope in main.c.
- lime.h: functions greetings() and screenInfo() have been given argument 'void'.
- In raytrace(), the passage of code starting at line 737 has been made a little more robust (it was generating compiler warnings).
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Includes some changes to the Makefile which should eventually make it easier to incorporate a python-interface version of Lime; as well as a few small fixes for things which under some circumstances generated compiler warnings or errors on MacOS.
I also included a -t command-line parameter for lime which compiles the code in test format (i.e. with debugger, fixed random seeds). This obviates the need to hack the Makefile each time.