From b1c68d04dd92c6568973b68ac1f6abad522ee2c8 Mon Sep 17 00:00:00 2001 From: John Schneiderman Date: Sun, 11 Aug 2024 09:59:53 +0200 Subject: [PATCH] Adds the ability to build from the top-level directory. --- README.md | 11 ++++------- make/makefile | 3 ++- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index d85e3b0..ead6dbc 100644 --- a/README.md +++ b/README.md @@ -82,22 +82,19 @@ A windows installer is provided with the release, the compiler is installed into ### Building The compiler can also be built using MSVC or GCC. A visual studio project and a makefile are part of the source repository. The makefile is in the make folder. -You should build from a subdirectory of Oscar64 so that references in the makefile work out correctly. - -* mkdir build -* cd build +You should build from the top-level directory of Oscar64: To build just the compiler: -* make -f ../make/makefile compiler +* make -f make/makefile compiler To build just game demonstrations: -* make -f ../make/makefile samples +* make -f make/makefile samples To build everything: -* make -f ../make/makefile all +* make -f make/makefile all ### Compiler arguments diff --git a/make/makefile b/make/makefile index f493a30..95b9116 100644 --- a/make/makefile +++ b/make/makefile @@ -57,7 +57,8 @@ all: --prep-build-dir compiler samples tests compiler: $(objects) @echo "Linking compiler..." - @$(CXX) $(CPPFLAGS) $(objects) $(linklibs) -o $(project_dir)/bin/oscar64 + @cd $(srcdir); \ + $(CXX) $(CPPFLAGS) $(objects) $(linklibs) -o $(project_dir)/bin/oscar64 .PHONY : clean