From 716a70afae3d7c16391ad7e76bce512af6e00b45 Mon Sep 17 00:00:00 2001
From: Angelo Papenhoff <angelo.papenhoff@gmail.com>
Date: Wed, 24 Dec 2014 14:04:46 +0100
Subject: [PATCH] Building null and opengl specific libraries now.

---
 Makefile    | 15 ++++++++++++---
 src/ogl.cpp | 15 +++++++++++++--
 2 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 9b57df9..603f2a1 100644
--- a/Makefile
+++ b/Makefile
@@ -1,13 +1,19 @@
+# null, opengl
+BUILD=null
+
+# e.g. null -> -DRW_NULL
+BUILDDEF:=$(shell echo $(BUILD) | tr a-z A-Z | sed 's/^/-DRW_/')
+BUILDDIR=build-$(BUILD)
 SRCDIR=src
-BUILDDIR=build
 SRC := $(patsubst %.cpp,$(SRCDIR)/%.cpp, rwbase.cpp clump.cpp\
                                          geometry.cpp plugins.cpp ps2.cpp\
                                          ogl.cpp)
 OBJ := $(patsubst $(SRCDIR)/%.cpp,$(BUILDDIR)/%.o,$(SRC))
 DEP := $(patsubst $(SRCDIR)/%.cpp,$(BUILDDIR)/%.d,$(SRC))
-CFLAGS=-Wall -Wextra -g #-Wno-parentheses #-Wconversion
+CFLAGS=-Wall -Wextra -g $(BUILDDEF) #-Wno-parentheses #-Wconversion
+LIB=librw-$(BUILD).a
 
-librw.a: $(OBJ)
+$(LIB): $(OBJ)
 	ar scr $@ $(OBJ)
 
 $(BUILDDIR)/%.o: $(SRCDIR)/%.cpp
@@ -16,4 +22,7 @@ $(BUILDDIR)/%.o: $(SRCDIR)/%.cpp
 $(BUILDDIR)/%.d: $(SRCDIR)/%.cpp
 	$(CXX) -MM -MT '$(patsubst $(SRCDIR)/%.cpp,$(BUILDDIR)/%.o,$<)' $(CFLAGS) $< > $@
 
+clean:
+	rm -f $(BUILDDIR)/*.[od]
+
 -include $(DEP)
diff --git a/src/ogl.cpp b/src/ogl.cpp
index df7f140..1bf380b 100644
--- a/src/ogl.cpp
+++ b/src/ogl.cpp
@@ -18,6 +18,17 @@ using namespace std;
 namespace Rw {
 namespace Gl {
 
+static void
+printAttribInfo(AttribDesc *attribs, int n)
+{
+	for(int i = 0; i < n; i++)
+		printf("%x %x %x %x %x %x\n",
+			attribs[i].index,
+			attribs[i].type,
+			attribs[i].normalized,
+			attribs[i].size);
+}
+
 void*
 DestroyNativeData(void *object, int32, int32)
 {
@@ -74,10 +85,10 @@ GetSizeNativeData(void *object, int32, int32)
 }
 
 
+#ifdef RW_OPENGL
 void
 UploadGeo(Geometry *geo)
 {
-	using namespace Rw;
 	InstanceDataHeader *inst = (InstanceDataHeader*)geo->instData;
 	MeshHeader *meshHeader = geo->meshHeader;
 
@@ -103,7 +114,6 @@ UploadGeo(Geometry *geo)
 void
 SetAttribPointers(InstanceDataHeader *inst)
 {
-	using namespace Rw;
 	static GLenum attribType[] = {
 		GL_FLOAT,
 		GL_BYTE, GL_UNSIGNED_BYTE,
@@ -117,6 +127,7 @@ SetAttribPointers(InstanceDataHeader *inst)
 		                      (void*)(uint64)a->offset);
 	}
 }
+#endif
 
 }
 }