From 264ed98d93df443f8a49d61b3efd3293312797e5 Mon Sep 17 00:00:00 2001
From: Florian Burgener <florian.brgnr@gmail.com>
Date: Mon, 20 Dec 2021 23:58:29 +0100
Subject: [PATCH] Rename Window and Update Makefile
---
.gitignore | 4 ++--
Makefile | 31 ++++++++++++++++++++-----------
main.c | 4 ++--
3 files changed, 24 insertions(+), 15 deletions(-)
diff --git a/.gitignore b/.gitignore
index 08922dc..d17f515 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
*.o
-main
-main.exe
+planetary_system
+planetary_system.exe
.vscode
diff --git a/Makefile b/Makefile
index eecedfe..14a3217 100644
--- a/Makefile
+++ b/Makefile
@@ -1,22 +1,31 @@
-TARGET = main
-# CCFLAGS
+TARGET = planetary_system
+LIBS = -lm
CC = gcc
-# CFLAGS:=-g -Ofast -Wall -Wextra -fsanitize=address -fsanitize=leak -std=gnu11
-# CFLAGS:=-fsanitize=address
-CFLAGS = -g -O3 -Wall -Wextra -std=gnu11
-LDFLAGS = -lm
+CFLAGS = -g -O3 -std=gnu11
ifeq ($(OS),Windows_NT)
- LDFLAGS += -lopengl32 -lglu32 -lfreeglut
+ LIBS += -lopengl32 -lglu32 -lfreeglut
else
- LDFLAGS += -lGL -lGLU -lglut
+ LIBS += -lGL -lGLU -lglut
endif
+.PHONY: default all clean
+
+default: $(TARGET)
+all: default
+
+OBJECTS = $(patsubst %.c, %.o, $(wildcard *.c))
+HEADERS = $(wildcard *.h)
+
%.o: %.c $(HEADERS)
$(CC) $(CFLAGS) -c $< -o $@
-$(TARGET): main.o Vector2.o CelestialObject.o PlanetarySystem.o drawing.o
- $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS)
+.PRECIOUS: $(TARGET) $(OBJECTS)
+
+$(TARGET): $(OBJECTS)
+ $(CC) $(OBJECTS) -Wall -Wextra $(LIBS) -o $@
clean:
- -rm -f *.o $(TARGET) $(TARGET).exe
+ -rm -f *.o
+ -rm -f $(TARGET)
+
diff --git a/main.c b/main.c
index 50af256..87ba16c 100644
--- a/main.c
+++ b/main.c
@@ -19,7 +19,7 @@
#include "drawing.h"
// Name of the window.
-const char WINDOW_NAME[] = "Solar System";
+const char WINDOW_NAME[] = "Planetary System";
// Refresh rate in Hz.
const int32_t REFRESH_RATE = 200;
// Number of microseconds in 1 second.
@@ -108,7 +108,7 @@ void draw() {
char title[100];
double elapsed_time = (double)(get_current_time() - start_time) / ONE_SECOND_IN_MICROSECONDS;
- sprintf(title, "Solar System (%.2lf)", elapsed_time);
+ sprintf(title, "%s (%.2lf)", WINDOW_NAME, elapsed_time);
glutSetWindowTitle(title);
planetary_system_draw(planetary_system);
--
GitLab