diff --git a/Engine/.project b/Engine/.project index 3eea083..fad2d60 100644 --- a/Engine/.project +++ b/Engine/.project @@ -1,6 +1,6 @@ - BladeBrothersEngine + Engine diff --git a/Engine/Debug/Animation.d b/Engine/Debug/Animation.d deleted file mode 100644 index 58e2ed0..0000000 --- a/Engine/Debug/Animation.d +++ /dev/null @@ -1,24 +0,0 @@ -Animation.d Animation.o: ../Animation.cpp ../Animation.h ../Graphics.h \ - /opt/local/include/GL/glut.h /opt/local/include/GL/gl.h \ - /opt/local/include/GL/glext.h /opt/local/include/GL/glu.h \ - /opt/local/include/GL/glpng.h ../Sprite.h ../FPS.h ../Log.h - -../Animation.h: - -../Graphics.h: - -/opt/local/include/GL/glut.h: - -/opt/local/include/GL/gl.h: - -/opt/local/include/GL/glext.h: - -/opt/local/include/GL/glu.h: - -/opt/local/include/GL/glpng.h: - -../Sprite.h: - -../FPS.h: - -../Log.h: diff --git a/Engine/Debug/Animation.o b/Engine/Debug/Animation.o deleted file mode 100644 index 05d040b..0000000 Binary files a/Engine/Debug/Animation.o and /dev/null differ diff --git a/Engine/Debug/Entity.d b/Engine/Debug/Entity.d deleted file mode 100644 index 1507bc8..0000000 --- a/Engine/Debug/Entity.d +++ /dev/null @@ -1,27 +0,0 @@ -Entity.d Entity.o: ../Entity.cpp ../Entity.h ../Sprite.h \ - /opt/local/include/GL/glpng.h /opt/local/include/GL/glut.h \ - /opt/local/include/GL/gl.h /opt/local/include/GL/glext.h \ - /opt/local/include/GL/glu.h ../Animation.h ../Graphics.h ../FPS.h \ - ../Log.h - -../Entity.h: - -../Sprite.h: - -/opt/local/include/GL/glpng.h: - -/opt/local/include/GL/glut.h: - -/opt/local/include/GL/gl.h: - -/opt/local/include/GL/glext.h: - -/opt/local/include/GL/glu.h: - -../Animation.h: - -../Graphics.h: - -../FPS.h: - -../Log.h: diff --git a/Engine/Debug/Entity.o b/Engine/Debug/Entity.o deleted file mode 100644 index 7489e47..0000000 Binary files a/Engine/Debug/Entity.o and /dev/null differ diff --git a/Engine/Debug/FPS.d b/Engine/Debug/FPS.d deleted file mode 100644 index f169fbb..0000000 --- a/Engine/Debug/FPS.d +++ /dev/null @@ -1,15 +0,0 @@ -FPS.d FPS.o: ../FPS.cpp ../FPS.h /opt/local/include/GL/glut.h \ - /opt/local/include/GL/gl.h /opt/local/include/GL/glext.h \ - /opt/local/include/GL/glu.h ../Log.h - -../FPS.h: - -/opt/local/include/GL/glut.h: - -/opt/local/include/GL/gl.h: - -/opt/local/include/GL/glext.h: - -/opt/local/include/GL/glu.h: - -../Log.h: diff --git a/Engine/Debug/FPS.o b/Engine/Debug/FPS.o deleted file mode 100644 index c8e516c..0000000 Binary files a/Engine/Debug/FPS.o and /dev/null differ diff --git a/Engine/Debug/Game.d b/Engine/Debug/Game.d deleted file mode 100644 index 85b1972..0000000 --- a/Engine/Debug/Game.d +++ /dev/null @@ -1,35 +0,0 @@ -Game.d Game.o: ../Game.cpp ../Game.h /opt/local/include/GL/glpng.h \ - /opt/local/include/GL/glut.h /opt/local/include/GL/gl.h \ - /opt/local/include/GL/glext.h /opt/local/include/GL/glu.h ../Graphics.h \ - ../Sprite.h ../Keyboard.h ../GameState.h ../Entity.h ../Animation.h \ - ../Map.h ../Log.h ../FPS.h - -../Game.h: - -/opt/local/include/GL/glpng.h: - -/opt/local/include/GL/glut.h: - -/opt/local/include/GL/gl.h: - -/opt/local/include/GL/glext.h: - -/opt/local/include/GL/glu.h: - -../Graphics.h: - -../Sprite.h: - -../Keyboard.h: - -../GameState.h: - -../Entity.h: - -../Animation.h: - -../Map.h: - -../Log.h: - -../FPS.h: diff --git a/Engine/Debug/Game.o b/Engine/Debug/Game.o deleted file mode 100644 index 55d6be7..0000000 Binary files a/Engine/Debug/Game.o and /dev/null differ diff --git a/Engine/Debug/GameState.d b/Engine/Debug/GameState.d deleted file mode 100644 index 8279559..0000000 --- a/Engine/Debug/GameState.d +++ /dev/null @@ -1,3 +0,0 @@ -GameState.d GameState.o: ../GameState.cpp ../GameState.h - -../GameState.h: diff --git a/Engine/Debug/GameState.o b/Engine/Debug/GameState.o deleted file mode 100644 index 60387ec..0000000 Binary files a/Engine/Debug/GameState.o and /dev/null differ diff --git a/Engine/Debug/Graphics.d b/Engine/Debug/Graphics.d deleted file mode 100644 index 5f1fb18..0000000 --- a/Engine/Debug/Graphics.d +++ /dev/null @@ -1,20 +0,0 @@ -Graphics.d Graphics.o: ../Graphics.cpp ../Graphics.h \ - /opt/local/include/GL/glut.h /opt/local/include/GL/gl.h \ - /opt/local/include/GL/glext.h /opt/local/include/GL/glu.h \ - /opt/local/include/GL/glpng.h ../Sprite.h ../Log.h - -../Graphics.h: - -/opt/local/include/GL/glut.h: - -/opt/local/include/GL/gl.h: - -/opt/local/include/GL/glext.h: - -/opt/local/include/GL/glu.h: - -/opt/local/include/GL/glpng.h: - -../Sprite.h: - -../Log.h: diff --git a/Engine/Debug/Graphics.o b/Engine/Debug/Graphics.o deleted file mode 100644 index 48a696e..0000000 Binary files a/Engine/Debug/Graphics.o and /dev/null differ diff --git a/Engine/Debug/Keyboard.d b/Engine/Debug/Keyboard.d deleted file mode 100644 index 94a48ab..0000000 --- a/Engine/Debug/Keyboard.d +++ /dev/null @@ -1,5 +0,0 @@ -Keyboard.d Keyboard.o: ../Keyboard.cpp ../Keyboard.h ../Log.h - -../Keyboard.h: - -../Log.h: diff --git a/Engine/Debug/Keyboard.o b/Engine/Debug/Keyboard.o deleted file mode 100644 index 21b962d..0000000 Binary files a/Engine/Debug/Keyboard.o and /dev/null differ diff --git a/Engine/Debug/Log.d b/Engine/Debug/Log.d deleted file mode 100644 index 0f48bf3..0000000 --- a/Engine/Debug/Log.d +++ /dev/null @@ -1,3 +0,0 @@ -Log.d Log.o: ../Log.cpp ../Log.h - -../Log.h: diff --git a/Engine/Debug/Log.o b/Engine/Debug/Log.o deleted file mode 100644 index 3e689db..0000000 Binary files a/Engine/Debug/Log.o and /dev/null differ diff --git a/Engine/Debug/Map.d b/Engine/Debug/Map.d deleted file mode 100644 index abbbb1a..0000000 --- a/Engine/Debug/Map.d +++ /dev/null @@ -1,22 +0,0 @@ -Map.d Map.o: ../Map.cpp ../Map.h ../Sprite.h \ - /opt/local/include/GL/glpng.h /opt/local/include/GL/glut.h \ - /opt/local/include/GL/gl.h /opt/local/include/GL/glext.h \ - /opt/local/include/GL/glu.h ../Log.h ../Graphics.h - -../Map.h: - -../Sprite.h: - -/opt/local/include/GL/glpng.h: - -/opt/local/include/GL/glut.h: - -/opt/local/include/GL/gl.h: - -/opt/local/include/GL/glext.h: - -/opt/local/include/GL/glu.h: - -../Log.h: - -../Graphics.h: diff --git a/Engine/Debug/Map.o b/Engine/Debug/Map.o deleted file mode 100644 index 9b347dc..0000000 Binary files a/Engine/Debug/Map.o and /dev/null differ diff --git a/Engine/Debug/Sprite.d b/Engine/Debug/Sprite.d deleted file mode 100644 index b203fed..0000000 --- a/Engine/Debug/Sprite.d +++ /dev/null @@ -1,18 +0,0 @@ -Sprite.d Sprite.o: ../Sprite.cpp ../Sprite.h \ - /opt/local/include/GL/glpng.h /opt/local/include/GL/glut.h \ - /opt/local/include/GL/gl.h /opt/local/include/GL/glext.h \ - /opt/local/include/GL/glu.h ../Log.h - -../Sprite.h: - -/opt/local/include/GL/glpng.h: - -/opt/local/include/GL/glut.h: - -/opt/local/include/GL/gl.h: - -/opt/local/include/GL/glext.h: - -/opt/local/include/GL/glu.h: - -../Log.h: diff --git a/Engine/Debug/Sprite.o b/Engine/Debug/Sprite.o deleted file mode 100644 index f9fbeab..0000000 Binary files a/Engine/Debug/Sprite.o and /dev/null differ diff --git a/Engine/Debug/Toolkit/main.d b/Engine/Debug/Toolkit/main.d deleted file mode 100644 index 08c59f6..0000000 --- a/Engine/Debug/Toolkit/main.d +++ /dev/null @@ -1,4 +0,0 @@ -Toolkit/main.d Toolkit/main.o: ../Toolkit/main.cpp \ - ../Toolkit/mainwindow.h - -../Toolkit/mainwindow.h: diff --git a/Engine/Debug/Toolkit/subdir.mk b/Engine/Debug/Toolkit/subdir.mk deleted file mode 100644 index 29702a7..0000000 --- a/Engine/Debug/Toolkit/subdir.mk +++ /dev/null @@ -1,27 +0,0 @@ -################################################################################ -# Automatically-generated file. Do not edit! -################################################################################ - -# Add inputs and outputs from these tool invocations to the build variables -CPP_SRCS += \ -../Toolkit/main.cpp \ -../Toolkit/mainwindow.cpp - -OBJS += \ -./Toolkit/main.o \ -./Toolkit/mainwindow.o - -CPP_DEPS += \ -./Toolkit/main.d \ -./Toolkit/mainwindow.d - - -# Each subdirectory must supply rules for building sources it contributes -Toolkit/%.o: ../Toolkit/%.cpp - @echo 'Building file: $<' - @echo 'Invoking: GCC C++ Compiler' - g++ -I/opt/local/include -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o"$@" "$<" - @echo 'Finished building: $<' - @echo ' ' - - diff --git a/Engine/Debug/main.d b/Engine/Debug/main.d deleted file mode 100644 index 5292718..0000000 --- a/Engine/Debug/main.d +++ /dev/null @@ -1,26 +0,0 @@ -main.d main.o: ../main.cpp /opt/local/include/GL/gl.h \ - /opt/local/include/GL/glext.h /opt/local/include/GL/glut.h \ - /opt/local/include/GL/glu.h ../Game.h /opt/local/include/GL/glpng.h \ - ../Graphics.h ../Sprite.h ../Keyboard.h ../GameState.h ../FPS.h - -/opt/local/include/GL/gl.h: - -/opt/local/include/GL/glext.h: - -/opt/local/include/GL/glut.h: - -/opt/local/include/GL/glu.h: - -../Game.h: - -/opt/local/include/GL/glpng.h: - -../Graphics.h: - -../Sprite.h: - -../Keyboard.h: - -../GameState.h: - -../FPS.h: diff --git a/Engine/Debug/main.o b/Engine/Debug/main.o deleted file mode 100644 index b6a2292..0000000 Binary files a/Engine/Debug/main.o and /dev/null differ diff --git a/Engine/Debug/makefile b/Engine/Debug/makefile deleted file mode 100644 index b743608..0000000 --- a/Engine/Debug/makefile +++ /dev/null @@ -1,59 +0,0 @@ -################################################################################ -# Automatically-generated file. Do not edit! -################################################################################ - --include ../makefile.init - -RM := rm -rf - -# All of the sources participating in the build are defined here --include sources.mk --include subdir.mk --include Toolkit/subdir.mk --include objects.mk - -ifneq ($(MAKECMDGOALS),clean) -ifneq ($(strip $(C++_DEPS)),) --include $(C++_DEPS) -endif -ifneq ($(strip $(C_DEPS)),) --include $(C_DEPS) -endif -ifneq ($(strip $(CC_DEPS)),) --include $(CC_DEPS) -endif -ifneq ($(strip $(CPP_DEPS)),) --include $(CPP_DEPS) -endif -ifneq ($(strip $(CXX_DEPS)),) --include $(CXX_DEPS) -endif -ifneq ($(strip $(C_UPPER_DEPS)),) --include $(C_UPPER_DEPS) -endif -endif - --include ../makefile.defs - -# Add inputs and outputs from these tool invocations to the build variables - -# All Target -all: BladeBrothersEngine - -# Tool invocations -BladeBrothersEngine: $(OBJS) $(USER_OBJS) - @echo 'Building target: $@' - @echo 'Invoking: MacOS X C++ Linker' - g++ -L/opt/local/lib -o "BladeBrothersEngine" $(OBJS) $(USER_OBJS) $(LIBS) - @echo 'Finished building target: $@' - @echo ' ' - -# Other Targets -clean: - -$(RM) $(C++_DEPS)$(OBJS)$(C_DEPS)$(CC_DEPS)$(CPP_DEPS)$(EXECUTABLES)$(CXX_DEPS)$(C_UPPER_DEPS) BladeBrothersEngine - -@echo ' ' - -.PHONY: all clean dependents -.SECONDARY: - --include ../makefile.targets diff --git a/Engine/Debug/objects.mk b/Engine/Debug/objects.mk deleted file mode 100644 index f153c55..0000000 --- a/Engine/Debug/objects.mk +++ /dev/null @@ -1,8 +0,0 @@ -################################################################################ -# Automatically-generated file. Do not edit! -################################################################################ - -USER_OBJS := - -LIBS := -lgl -lglu -lglut -lglpng - diff --git a/Engine/Debug/sources.mk b/Engine/Debug/sources.mk deleted file mode 100644 index dd5a1db..0000000 --- a/Engine/Debug/sources.mk +++ /dev/null @@ -1,28 +0,0 @@ -################################################################################ -# Automatically-generated file. Do not edit! -################################################################################ - -O_SRCS := -CPP_SRCS := -C_UPPER_SRCS := -C_SRCS := -S_UPPER_SRCS := -OBJ_SRCS := -ASM_SRCS := -CXX_SRCS := -C++_SRCS := -CC_SRCS := -C++_DEPS := -OBJS := -C_DEPS := -CC_DEPS := -CPP_DEPS := -EXECUTABLES := -CXX_DEPS := -C_UPPER_DEPS := - -# Every subdirectory with source files must be described here -SUBDIRS := \ -. \ -Toolkit \ - diff --git a/Engine/Debug/subdir.mk b/Engine/Debug/subdir.mk deleted file mode 100644 index 2af1650..0000000 --- a/Engine/Debug/subdir.mk +++ /dev/null @@ -1,54 +0,0 @@ -################################################################################ -# Automatically-generated file. Do not edit! -################################################################################ - -# Add inputs and outputs from these tool invocations to the build variables -CPP_SRCS += \ -../Animation.cpp \ -../Entity.cpp \ -../FPS.cpp \ -../Game.cpp \ -../GameState.cpp \ -../Graphics.cpp \ -../Keyboard.cpp \ -../Log.cpp \ -../Map.cpp \ -../Sprite.cpp \ -../main.cpp - -OBJS += \ -./Animation.o \ -./Entity.o \ -./FPS.o \ -./Game.o \ -./GameState.o \ -./Graphics.o \ -./Keyboard.o \ -./Log.o \ -./Map.o \ -./Sprite.o \ -./main.o - -CPP_DEPS += \ -./Animation.d \ -./Entity.d \ -./FPS.d \ -./Game.d \ -./GameState.d \ -./Graphics.d \ -./Keyboard.d \ -./Log.d \ -./Map.d \ -./Sprite.d \ -./main.d - - -# Each subdirectory must supply rules for building sources it contributes -%.o: ../%.cpp - @echo 'Building file: $<' - @echo 'Invoking: GCC C++ Compiler' - g++ -I/opt/local/include -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o"$@" "$<" - @echo 'Finished building: $<' - @echo ' ' - -