summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexey Gavrilov <90127298+rebovas@users.noreply.github.com>2024-03-31 15:38:24 +0700
committerGitHub <noreply@github.com>2024-03-31 15:38:24 +0700
commit9ad5b9b6a1f8d641ac13f7c004afd6ea9bff50ee (patch)
tree37f1488626d5bc16c085d0449c8ea99e277be150
parent18b4f9d1bff908fd91a48c1953ebcb8363855a59 (diff)
parent744d1873856f55920aac96d207f8c170610de500 (diff)
Merge pull request #7 from rebovas/makefile_update
Makefile updates
-rw-r--r--README.md15
-rw-r--r--makefile2
2 files changed, 11 insertions, 6 deletions
diff --git a/README.md b/README.md
index f2b6536..c46e5fc 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-## Object Operating System
+## Objective Operating System
## Install dependencies
@@ -20,8 +20,8 @@ These variables may pass through *make* command `make *variables* *rule*`, or us
#### Variables
-1. DEBUG. Takes a boolean value (true or false). Responsible for the debug version of the project to test it via GDB.
-2. LIBS_PATH. Takes the path to the required (gcc and stdc++) libraries.
+1. DEBUG. Not takes value. If defineв, the debug version of the project will be build, otherwise the release version. Responsible for the debug version of the project to test OS via GDB.
+2. LIBS_PATH. Takes the path to the required libraries. Now gcc library is required, supplied with the compiled.
#### Ubuntu
@@ -32,7 +32,12 @@ make all
Build and run debug version
```sh
-make DEBUG=true all
+make DEBUG=* all
+```
+or
+```sh
+export DEBUG=*
+make all
```
## Docs
@@ -41,7 +46,7 @@ make DEBUG=true all
- [The GNU GRUB manual][2]
- [Executable and linkable format ELF][3]
- [NASM documentation][4]
-- [Article where creating a simple OS][5]
+- [Article about creatiing a simple OS][5]
- [Multiboot specification][6]
- [GCC compiler documentation][7]
- [Using NASM in a Hello World kernel][8]
diff --git a/makefile b/makefile
index ef46637..439c42e 100644
--- a/makefile
+++ b/makefile
@@ -14,7 +14,7 @@ SOURCE_FILES = $(CFILES) $(AFILES)
OBJ_FILES = $(addprefix $(BDIR)/, $(addsuffix .o, $(basename $(SOURCE_FILES))))
INCLUDE = ./include
-ifeq ($(DEBUG), true)
+ifdef DEBUG
CFLAGS := -g3 $(CFLAGS)
AFLAGS := -g $(AFLAGS)
QEMUFLAGS := -s -S $(QEMUFLAGS)