From e8c4dec5d2b8716779ae9e57ab75caa15990a0f1 Mon Sep 17 00:00:00 2001
From: Rtch90 <ritchie.cunningham@protonmail.com>
Date: Sat, 7 Apr 2012 22:33:25 +0100
Subject: [PATCH] [Fix] Fixed Makefiles. [Announcement] Tamir has joined the
LibD development. :D
---
Bin/Makefile | 13 ++++++++++---
src/Actor/Makefile | 20 ++++++++++++++++++++
src/Main/Game.cpp | 2 +-
3 files changed, 31 insertions(+), 4 deletions(-)
create mode 100644 src/Actor/Makefile
diff --git a/Bin/Makefile b/Bin/Makefile
index 9964c7c..eb9833f 100644
--- a/Bin/Makefile
+++ b/Bin/Makefile
@@ -9,16 +9,23 @@ default: all
all:
$(MAKE) -C ../src/Main
+ $(MAKE) -C ../src/Texture
+ $(MAKE) -C ../src/Actor
- $(CC) $(CFLAGS) -o LibD ../src/Main/main.cpp ../src/Main/*.o $(LDADD)
+ $(CC) $(CFLAGS) -o LibD ../src/Main/main.cpp ../src/Main/*.o ../src/Texture/*.o \
+ ../src/Actor/*.o $(LDADD)
static:
@echo -e "\033[1;31mThis is an experimental build, if it does not work, don't complain...\033[0m"
@sleep 1
- $(MAKE) -C ../src/Main/
+ $(MAKE) -C ../src/Main/ ../src/Main/*.o ../src/Texture/*.o \
+ ../src/Actor/*.o
- $(CC) $(CFLAGS) -o build/LibD-static ../src/Main/main.cpp ../src/Main/*.o $(LDADDSTATIC)
+ $(CC) $(CFLAGS) -o build/LibD-static ../src/Main/main.cpp ../src/Main/*.o \
+ ../src/Texture/*.o ../src/Actor/*.o $(LDADDSTATIC)
clean:
$(MAKE) -C ../src/Main/ clean
+ $(MAKE) -C ../src/Texture/ clean
+ $(MAKE) -C ../src/Actor/ clean
rm -f LibD
diff --git a/src/Actor/Makefile b/src/Actor/Makefile
new file mode 100644
index 0000000..12cf429
--- /dev/null
+++ b/src/Actor/Makefile
@@ -0,0 +1,20 @@
+CC = g++
+CFLAGS = -ansi -Wall -g
+LDADD = -lGL -lGLU -lSDL -lSDL_image
+
+objects = Player.o \
+
+
+.PHONY: default all clean
+
+default: all
+
+%.cpp: %.h
+
+%.o: %.cpp
+ $(CC) $(CFLAGS) -c -o $@ $<
+
+all: $(objects)
+
+clean:
+ rm -f $(objects)
diff --git a/src/Main/Game.cpp b/src/Main/Game.cpp
index ff81f28..6e4e760 100644
--- a/src/Main/Game.cpp
+++ b/src/Main/Game.cpp
@@ -38,7 +38,7 @@ void Game::Render(void) {
glRotatef(_rotationAngle, 0, 0, 1);
glBegin(GL_TRIANGLES);
- glColor4f(1.0f, 0.0f, 0.0f, 1.0f);
+ glColor4f(1.0f, 0.0f, 0.0f, 1.0f);
glVertex3f(-1.0f, -0.5f, -4.0f);
glColor4f(1.0f, 1.0f, 0.0f, 1.0f);
glVertex3f(1.0f, -0.5f, -4.0f);