diff options
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | BlackShades.mcp | bin | 87343 -> 0 bytes | |||
| -rw-r--r-- | BlackShades.rsrc | 0 | ||||
| -rw-r--r-- | Makefile | 11 | ||||
| -rw-r--r-- | Makefile.zakk | 77 | ||||
| -rw-r--r-- | src/AGL_DSp.cpp (renamed from Source/AGL_DSp.cpp) | 0 | ||||
| -rw-r--r-- | src/AGL_DSp.h (renamed from Source/AGL_DSp.h) | 0 | ||||
| -rw-r--r-- | src/Alerts.cpp (renamed from Source/Alerts.cpp) | 0 | ||||
| -rw-r--r-- | src/Alerts.h (renamed from Source/Alerts.h) | 0 | ||||
| -rw-r--r-- | src/Camera.cpp (renamed from Source/Camera.cpp) | 0 | ||||
| -rw-r--r-- | src/Camera.h (renamed from Source/Camera.h) | 0 | ||||
| -rw-r--r-- | src/Constants.h (renamed from Source/Constants.h) | 0 | ||||
| -rw-r--r-- | src/Decals.cpp (renamed from Source/Decals.cpp) | 0 | ||||
| -rw-r--r-- | src/Decals.h (renamed from Source/Decals.h) | 0 | ||||
| -rw-r--r-- | src/Files.cpp (renamed from Source/Files.cpp) | 0 | ||||
| -rw-r--r-- | src/Files.h (renamed from Source/Files.h) | 0 | ||||
| -rw-r--r-- | src/Fog.cpp (renamed from Source/Fog.cpp) | 0 | ||||
| -rw-r--r-- | src/Fog.h (renamed from Source/Fog.h) | 0 | ||||
| -rw-r--r-- | src/Frustum.cpp (renamed from Source/Frustum.cpp) | 0 | ||||
| -rw-r--r-- | src/Frustum.h (renamed from Source/Frustum.h) | 0 | ||||
| -rw-r--r-- | src/Game.h (renamed from Source/Game.h) | 0 | ||||
| -rw-r--r-- | src/GameDraw.cpp (renamed from Source/GameDraw.cpp) | 0 | ||||
| -rw-r--r-- | src/GameInitDispose.cpp (renamed from Source/GameInitDispose.cpp) | 0 | ||||
| -rw-r--r-- | src/GameLoop.cpp (renamed from Source/GameLoop.cpp) | 0 | ||||
| -rw-r--r-- | src/GameTick.cpp (renamed from Source/GameTick.cpp) | 0 | ||||
| -rw-r--r-- | src/Globals.cpp (renamed from Source/Globals.cpp) | 0 | ||||
| -rw-r--r-- | src/MacInput.cpp (renamed from Source/MacInput.cpp) | 0 | ||||
| -rw-r--r-- | src/MacInput.h (renamed from Source/MacInput.h) | 0 | ||||
| -rw-r--r-- | src/Main.cpp (renamed from Source/Main.cpp) | 0 | ||||
| -rw-r--r-- | src/Maths.cpp (renamed from Source/Maths.cpp) | 0 | ||||
| -rw-r--r-- | src/Maths.h (renamed from Source/Maths.h) | 0 | ||||
| -rw-r--r-- | src/Models.cpp (renamed from Source/Models.cpp) | 0 | ||||
| -rw-r--r-- | src/Models.h (renamed from Source/Models.h) | 0 | ||||
| -rw-r--r-- | src/Person.cpp (renamed from Source/Person.cpp) | 0 | ||||
| -rw-r--r-- | src/Person.h (renamed from Source/Person.h) | 0 | ||||
| -rw-r--r-- | src/PhysicsMath.h (renamed from Source/PhysicsMath.h) | 0 | ||||
| -rw-r--r-- | src/Quaternions.cpp (renamed from Source/Quaternions.cpp) | 0 | ||||
| -rw-r--r-- | src/Quaternions.h (renamed from Source/Quaternions.h) | 0 | ||||
| -rw-r--r-- | src/SConstruct (renamed from Source/SConstruct) | 0 | ||||
| -rw-r--r-- | src/Serialize.cpp (renamed from Source/Serialize.cpp) | 0 | ||||
| -rw-r--r-- | src/Serialize.h (renamed from Source/Serialize.h) | 0 | ||||
| -rw-r--r-- | src/Skeleton.cpp (renamed from Source/Skeleton.cpp) | 0 | ||||
| -rw-r--r-- | src/Skeleton.h (renamed from Source/Skeleton.h) | 0 | ||||
| -rw-r--r-- | src/Sprites.cpp (renamed from Source/Sprites.cpp) | 0 | ||||
| -rw-r--r-- | src/Sprites.h (renamed from Source/Sprites.h) | 0 | ||||
| -rw-r--r-- | src/Support.cpp (renamed from Source/Support.cpp) | 0 | ||||
| -rw-r--r-- | src/Support.h (renamed from Source/Support.h) | 0 | ||||
| -rw-r--r-- | src/TGALoader.cpp (renamed from Source/TGALoader.cpp) | 0 | ||||
| -rw-r--r-- | src/TGALoader.h (renamed from Source/TGALoader.h) | 2 | ||||
| -rw-r--r-- | src/Text.cpp (renamed from Source/Text.cpp) | 0 | ||||
| -rw-r--r-- | src/Text.h (renamed from Source/Text.h) | 0 | ||||
| -rw-r--r-- | src/Textures.cpp (renamed from Source/Textures.cpp) | 0 | ||||
| -rw-r--r-- | src/Textures.h (renamed from Source/Textures.h) | 0 | ||||
| -rw-r--r-- | src/Timer.cpp (renamed from Source/Timer.cpp) | 0 | ||||
| -rw-r--r-- | src/Timer.h (renamed from Source/Timer.h) | 0 |
55 files changed, 6 insertions, 86 deletions
diff --git a/.gitignore b/.gitignore index d9c4f04..567609b 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -objs/ +build/ diff --git a/BlackShades.mcp b/BlackShades.mcp deleted file mode 100644 index 8ad6550..0000000 --- a/BlackShades.mcp +++ /dev/null Binary files differdiff --git a/BlackShades.rsrc b/BlackShades.rsrc deleted file mode 100644 index e69de29..0000000 --- a/BlackShades.rsrc +++ /dev/null diff --git a/Makefile b/Makefile index 613e01c..d8f241e 100644 --- a/Makefile +++ b/Makefile @@ -2,11 +2,11 @@ CC := gcc CXX := g++ LINKER := g++ ASM := nasm -SRCDIR := ./Source -BINDIR := ./objs +SRCDIR := ./src +BINDIR := ./build EXE := $(BINDIR)/blackshades -CFLAGS := -O2 -Wall -g $(shell sdl-config --cflags) -I$(SRCDIR) -include Source/Support.h +CFLAGS := -O2 -Wall -g $(shell sdl-config --cflags) -I$(SRCDIR) CXXFLAGS := $(CFLAGS) LDFLAGS := $(shell sdl-config --libs) -lSDL_image -lGL -lGLU -lopenal -lalut # -framework QuickTime @@ -50,7 +50,6 @@ CLEANUP = $(wildcard *.exe) $(wildcard *.obj) \ $(wildcard *~) $(wildcard *.err) \ $(wildcard .\#*) core $(EXE) - # Rules for compiling individual source files... $(BINDIR)/%.o: $(SRCDIR)/%.cpp @@ -79,7 +78,3 @@ distclean: clean clean: rm -f $(CLEANUP) rm -rf $(BINDIR) - -# end of Makefile. - - diff --git a/Makefile.zakk b/Makefile.zakk deleted file mode 100644 index f8b1e5d..0000000 --- a/Makefile.zakk +++ /dev/null @@ -1,77 +0,0 @@ -CC := gcc -CXX := g++ -LINKER := g++ -ASM := nasm -SRCDIR := ./Source -BINDIR := ./objs -EXE := $(BINDIR)/blackshades - -CFLAGS := -g $(shell sdl-config --cflags) -I/System/Library/Frameworks/Carbon.framework/Versions/A/Frameworks/CarbonSound.framework/Versions/A/Headers -I/System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/CarbonCore.framework/Versions/A/Headers -I/System/Library/Frameworks/GLUT.framework/Versions/A/Headers -I/System/Library/Frameworks/DrawSprocket.framework/Versions/A/Headers -I/Developer/Headers/FlatCarbon -I/System/Library/Frameworks/AGL.framework/Versions/A/Headers -I/System/Library/Frameworks/OpenGL.framework/Versions/A/Headers -I/sw/include -I/sw/include/AL -I/usr/X11R6/include -D POOLOOPS -I$(SRCDIR) -CXXFLAGS := $(CFLAGS) -LDFLAGS := $(shell sdl-config --libs) -framework QuickTime - -SRCS := Camera.cpp \ - Decals.cpp \ - Files.cpp \ - Fog.cpp \ - Frustum.cpp \ - GameDraw.cpp \ - GameInitDispose.cpp \ - GameLoop.cpp \ - GameTick.cpp \ - Globals.cpp \ - Main.cpp \ - Maths.cpp \ - Models.cpp \ - Person.cpp \ - Quaternions.cpp \ - Skeleton.cpp \ - Sprites.cpp \ - TGALoader.cpp \ - Text.cpp \ - Timer.cpp - -OBJS1 := $(SRCS:.c=.o) -OBJS2 := $(OBJS1:.cpp=.o) -OBJS3 := $(OBJS2:.asm=.o) -OBJS := $(foreach f,$(OBJS3),$(BINDIR)/$(f)) -SRCS := $(foreach f,$(SRCS),$(SRCDIR)/$(f)) - -CLEANUP = $(wildcard *.exe) $(wildcard *.obj) \ - $(wildcard $(BINDIR)/*.exe) $(wildcard $(BINDIR)/*.obj) \ - $(wildcard *~) $(wildcard *.err) \ - $(wildcard .\#*) core $(EXE) - - -# Rules for compiling individual source files... - -$(BINDIR)/%.o: $(SRCDIR)/%.cpp - $(CC) -c -o $@ $< $(CXXFLAGS) - -$(BINDIR)/%.o: $(SRCDIR)/%.c - $(CC) -c -o $@ $< $(CFLAGS) - -$(BINDIR)/%.o: $(SRCDIR)/%.asm - $(ASM) $(ASMFLAGS) -o $@ $< - -.PHONY: all bindir blackshades -all: blackshades - -blackshades: $(BINDIR) $(OBJS) - $(LINKER) -o $(EXE) $(OBJS) $(LDFLAGS) - -$(BINDIR) : - $(MAKE) bindir - -bindir: - mkdir -p $(BINDIR) - -distclean: clean - -clean: - rm -f $(CLEANUP) - rm -rf $(BINDIR) - -# end of Makefile. - - diff --git a/Source/AGL_DSp.cpp b/src/AGL_DSp.cpp index eace870..eace870 100644 --- a/Source/AGL_DSp.cpp +++ b/src/AGL_DSp.cpp diff --git a/Source/AGL_DSp.h b/src/AGL_DSp.h index 4c1d531..4c1d531 100644 --- a/Source/AGL_DSp.h +++ b/src/AGL_DSp.h diff --git a/Source/Alerts.cpp b/src/Alerts.cpp index acfefae..acfefae 100644 --- a/Source/Alerts.cpp +++ b/src/Alerts.cpp diff --git a/Source/Alerts.h b/src/Alerts.h index 5db7938..5db7938 100644 --- a/Source/Alerts.h +++ b/src/Alerts.h diff --git a/Source/Camera.cpp b/src/Camera.cpp index 950c12d..950c12d 100644 --- a/Source/Camera.cpp +++ b/src/Camera.cpp diff --git a/Source/Camera.h b/src/Camera.h index a31055f..a31055f 100644 --- a/Source/Camera.h +++ b/src/Camera.h diff --git a/Source/Constants.h b/src/Constants.h index 76c67de..76c67de 100644 --- a/Source/Constants.h +++ b/src/Constants.h diff --git a/Source/Decals.cpp b/src/Decals.cpp index 3cebb4c..3cebb4c 100644 --- a/Source/Decals.cpp +++ b/src/Decals.cpp diff --git a/Source/Decals.h b/src/Decals.h index 127a6d2..127a6d2 100644 --- a/Source/Decals.h +++ b/src/Decals.h diff --git a/Source/Files.cpp b/src/Files.cpp index dd55c52..dd55c52 100644 --- a/Source/Files.cpp +++ b/src/Files.cpp diff --git a/Source/Files.h b/src/Files.h index 35f4b6e..35f4b6e 100644 --- a/Source/Files.h +++ b/src/Files.h diff --git a/Source/Fog.cpp b/src/Fog.cpp index 21ca229..21ca229 100644 --- a/Source/Fog.cpp +++ b/src/Fog.cpp diff --git a/Source/Fog.h b/src/Fog.h index a7e0c25..a7e0c25 100644 --- a/Source/Fog.h +++ b/src/Fog.h diff --git a/Source/Frustum.cpp b/src/Frustum.cpp index 0e617b8..0e617b8 100644 --- a/Source/Frustum.cpp +++ b/src/Frustum.cpp diff --git a/Source/Frustum.h b/src/Frustum.h index 1680226..1680226 100644 --- a/Source/Frustum.h +++ b/src/Frustum.h diff --git a/Source/Game.h b/src/Game.h index e7d5b53..e7d5b53 100644 --- a/Source/Game.h +++ b/src/Game.h diff --git a/Source/GameDraw.cpp b/src/GameDraw.cpp index c79d87e..c79d87e 100644 --- a/Source/GameDraw.cpp +++ b/src/GameDraw.cpp diff --git a/Source/GameInitDispose.cpp b/src/GameInitDispose.cpp index 7f22344..7f22344 100644 --- a/Source/GameInitDispose.cpp +++ b/src/GameInitDispose.cpp diff --git a/Source/GameLoop.cpp b/src/GameLoop.cpp index 8a72b4b..8a72b4b 100644 --- a/Source/GameLoop.cpp +++ b/src/GameLoop.cpp diff --git a/Source/GameTick.cpp b/src/GameTick.cpp index ce597df..ce597df 100644 --- a/Source/GameTick.cpp +++ b/src/GameTick.cpp diff --git a/Source/Globals.cpp b/src/Globals.cpp index fa18cfe..fa18cfe 100644 --- a/Source/Globals.cpp +++ b/src/Globals.cpp diff --git a/Source/MacInput.cpp b/src/MacInput.cpp index 512200d..512200d 100644 --- a/Source/MacInput.cpp +++ b/src/MacInput.cpp diff --git a/Source/MacInput.h b/src/MacInput.h index 0c741aa..0c741aa 100644 --- a/Source/MacInput.h +++ b/src/MacInput.h diff --git a/Source/Main.cpp b/src/Main.cpp index 2c8f381..2c8f381 100644 --- a/Source/Main.cpp +++ b/src/Main.cpp diff --git a/Source/Maths.cpp b/src/Maths.cpp index 58e769a..58e769a 100644 --- a/Source/Maths.cpp +++ b/src/Maths.cpp diff --git a/Source/Maths.h b/src/Maths.h index d9a8f61..d9a8f61 100644 --- a/Source/Maths.h +++ b/src/Maths.h diff --git a/Source/Models.cpp b/src/Models.cpp index 8caefd8..8caefd8 100644 --- a/Source/Models.cpp +++ b/src/Models.cpp diff --git a/Source/Models.h b/src/Models.h index e49b8f1..e49b8f1 100644 --- a/Source/Models.h +++ b/src/Models.h diff --git a/Source/Person.cpp b/src/Person.cpp index 43aa873..43aa873 100644 --- a/Source/Person.cpp +++ b/src/Person.cpp diff --git a/Source/Person.h b/src/Person.h index e7542b0..e7542b0 100644 --- a/Source/Person.h +++ b/src/Person.h diff --git a/Source/PhysicsMath.h b/src/PhysicsMath.h index c975941..c975941 100644 --- a/Source/PhysicsMath.h +++ b/src/PhysicsMath.h diff --git a/Source/Quaternions.cpp b/src/Quaternions.cpp index 464c0f2..464c0f2 100644 --- a/Source/Quaternions.cpp +++ b/src/Quaternions.cpp diff --git a/Source/Quaternions.h b/src/Quaternions.h index 0a0ca4f..0a0ca4f 100644 --- a/Source/Quaternions.h +++ b/src/Quaternions.h diff --git a/Source/SConstruct b/src/SConstruct index 70fa779..70fa779 100644 --- a/Source/SConstruct +++ b/src/SConstruct diff --git a/Source/Serialize.cpp b/src/Serialize.cpp index 589dcb9..589dcb9 100644 --- a/Source/Serialize.cpp +++ b/src/Serialize.cpp diff --git a/Source/Serialize.h b/src/Serialize.h index 4ecb46d..4ecb46d 100644 --- a/Source/Serialize.h +++ b/src/Serialize.h diff --git a/Source/Skeleton.cpp b/src/Skeleton.cpp index 5f1880f..5f1880f 100644 --- a/Source/Skeleton.cpp +++ b/src/Skeleton.cpp diff --git a/Source/Skeleton.h b/src/Skeleton.h index 9730665..9730665 100644 --- a/Source/Skeleton.h +++ b/src/Skeleton.h diff --git a/Source/Sprites.cpp b/src/Sprites.cpp index f800282..f800282 100644 --- a/Source/Sprites.cpp +++ b/src/Sprites.cpp diff --git a/Source/Sprites.h b/src/Sprites.h index b1f6b2e..b1f6b2e 100644 --- a/Source/Sprites.h +++ b/src/Sprites.h diff --git a/Source/Support.cpp b/src/Support.cpp index 7c77fc5..7c77fc5 100644 --- a/Source/Support.cpp +++ b/src/Support.cpp diff --git a/Source/Support.h b/src/Support.h index 49b83fc..49b83fc 100644 --- a/Source/Support.h +++ b/src/Support.h diff --git a/Source/TGALoader.cpp b/src/TGALoader.cpp index 3090764..3090764 100644 --- a/Source/TGALoader.cpp +++ b/src/TGALoader.cpp diff --git a/Source/TGALoader.h b/src/TGALoader.h index 2e711e5..83f4476 100644 --- a/Source/TGALoader.h +++ b/src/TGALoader.h @@ -16,6 +16,8 @@ #include <GL/gl.h> #endif +#include "Support.h" + /**> DATA STRUCTURES <**/ typedef struct TGAImageRec { diff --git a/Source/Text.cpp b/src/Text.cpp index 2c2323a..2c2323a 100644 --- a/Source/Text.cpp +++ b/src/Text.cpp diff --git a/Source/Text.h b/src/Text.h index 99e8a6c..99e8a6c 100644 --- a/Source/Text.h +++ b/src/Text.h diff --git a/Source/Textures.cpp b/src/Textures.cpp index 0f829dc..0f829dc 100644 --- a/Source/Textures.cpp +++ b/src/Textures.cpp diff --git a/Source/Textures.h b/src/Textures.h index 6deeb1e..6deeb1e 100644 --- a/Source/Textures.h +++ b/src/Textures.h diff --git a/Source/Timer.cpp b/src/Timer.cpp index 80cc5f9..80cc5f9 100644 --- a/Source/Timer.cpp +++ b/src/Timer.cpp diff --git a/Source/Timer.h b/src/Timer.h index c0c99a1..c0c99a1 100644 --- a/Source/Timer.h +++ b/src/Timer.h |