Apitrace updates, DSA fixes, NV_bindless_texture, NV_draw_texture, AMD_sparse_texture.

Regal gl.py fixups.
Initial build target support for wrangler-mode Regal.
GLEW refresh.

Author: nigels-com

Makefile

@@ -24,7 +24,9 @@ include Makefile.zlib
 include Makefile.libpng
 include Makefile.snappy
 include Makefile.apitrace
+# include Makefile.glslopt
 include Makefile.regal
+include Makefile.regalw
 include Makefile.glu
 include Makefile.glut
 include Makefile.glew

Makefile.dreamtorus

@@ -50,8 +50,8 @@ tmp/$(SYSTEM)/dreamtorus/static/%.o: examples/dreamtorus/glut/code/%.cpp
 	@mkdir -p $(dir $@)
 	$(LOG_CXX)$(CCACHE) $(CXX) $(DREAMTORUS.CFLAGS) $(CFLAGS) $(CFLAGS.SO) -o $@ -c $<
 
-DREAMTORUS.DEPEND :=  
-DREAMTORUS.DEPEND += lib/$(SYSTEM)/$(REGAL.SHARED) 
+DREAMTORUS.DEPEND :=
+DREAMTORUS.DEPEND += lib/$(SYSTEM)/$(REGAL.SHARED)
 
 ifdef GLUT.SHARED
 bin/$(SYSTEM)/dreamtorus: lib/$(SYSTEM)/$(GLUT.SHARED) lib/$(SYSTEM)/$(GLU.SHARED)

Makefile.dreamtorus_static

@@ -49,7 +49,7 @@ DREAMTORUS_STATIC.CFLAGS     := -Iinclude -Iexamples/dreamtorus/src
 DREAMTORUS_STATIC.LIBS       += -Llib/$(SYSTEM)
 
 ifndef GLUT.STATIC
-DREAMTORUS_STATIC.LIBS       += $(LDFLAGS.GLUT) $(LDFLAGS.GLU) 
+DREAMTORUS_STATIC.LIBS       += $(LDFLAGS.GLUT) $(LDFLAGS.GLU)
 endif
 
 DREAMTORUS_STATIC.LIBS       += $(LDFLAGS.X11)
@@ -66,8 +66,8 @@ tmp/$(SYSTEM)/dreamtorus_static/static/%.o: examples/dreamtorus/glut/code/%.cpp
 	@mkdir -p $(dir $@)
 	$(LOG_CXX)$(CCACHE) $(CXX) $(DREAMTORUS_STATIC.CFLAGS) $(CFLAGS) $(CFLAGS.SO) -o $@ -c $<
 
-DREAMTORUS_STATIC.DEPEND :=  
-DREAMTORUS_STATIC.DEPEND += lib/$(SYSTEM)/$(REGAL.STATIC) 
+DREAMTORUS_STATIC.DEPEND :=
+DREAMTORUS_STATIC.DEPEND += lib/$(SYSTEM)/$(REGAL.STATIC)
 
 ifdef GLUT.STATIC
 DREAMTORUS_STATIC.DEPEND += lib/$(SYSTEM)/$(GLUT.STATIC) lib/$(SYSTEM)/$(GLU.STATIC)
@@ -76,9 +76,9 @@ endif
 bin/$(SYSTEM)/$(DREAMTORUS_STATIC.EXE): $(DREAMTORUS_STATIC.OBJS) $(DREAMTORUS_STATIC.DEPEND)
 	@mkdir -p $(dir $@)
 ifdef APITRACE.STATIC
-	$(LOG_LD)$(CCACHE) $(LD) $(LDFLAGS.EXTRA) -o $@ $(DREAMTORUS_STATIC.OBJS) $(LDFLAGS.STARTGROUP) lib/$(SYSTEM)/$(REGAL.STATIC) lib/$(SYSTEM)/$(APITRACE.STATIC) $(LDFLAGS.ENDGROUP) $(REGAL.SHARED.DEPEND) $(DREAMTORUS_STATIC.DEPEND) $(REGAL.LIBS) $(REGAL.LDFLAGS) $(DREAMTORUS_STATIC.LIBS) 
+	$(LOG_LD)$(CCACHE) $(LD) $(LDFLAGS.EXTRA) -o $@ $(DREAMTORUS_STATIC.OBJS) $(LDFLAGS.STARTGROUP) lib/$(SYSTEM)/$(REGAL.STATIC) lib/$(SYSTEM)/$(APITRACE.STATIC) $(LDFLAGS.ENDGROUP) $(REGAL.SHARED.DEPEND) $(DREAMTORUS_STATIC.DEPEND) $(REGAL.LIBS) $(REGAL.LDFLAGS) $(DREAMTORUS_STATIC.LIBS)
 else
-	$(LOG_LD)$(CCACHE) $(LD) $(LDFLAGS.EXTRA) -o $@ $(DREAMTORUS_STATIC.OBJS) lib/$(SYSTEM)/$(REGAL.STATIC) $(REGAL.SHARED.DEPEND) $(DREAMTORUS_STATIC.DEPEND) $(REGAL.LDFLAGS) $(DREAMTORUS_STATIC.LIBS) 
+	$(LOG_LD)$(CCACHE) $(LD) $(LDFLAGS.EXTRA) -o $@ $(DREAMTORUS_STATIC.OBJS) lib/$(SYSTEM)/$(REGAL.STATIC) $(REGAL.SHARED.DEPEND) $(DREAMTORUS_STATIC.DEPEND) $(REGAL.LDFLAGS) $(DREAMTORUS_STATIC.LIBS)
 endif
 ifneq ($(STRIP),)
 	$(LOG_STRIP)$(STRIP) -x $@

Makefile.glslopt

@@ -0,0 +1,77 @@
+#
+# Makefile for the GLSL Optimizer component of the Regal runtime.
+# The GLSL Optimizer is always build into Regal, but you can build
+# just this target static library with:
+# make -f Makefile.glslopt
+#
+
+ifndef MAKEFILE_GLSLOPT_INCLUDED
+MAKEFILE_GLSLOPT_INCLUDED := 1
+
+.PHONY: glslopt.lib glslopt.clean
+
+include build/common.inc
+include build/glslopt.inc
+
+ifdef GLSLOPT.STATIC
+
+all:: glslopt.lib
+
+clean:: glslopt.clean
+
+GLSLOPT.SRCS       := $(GLSLOPT.CXX)
+GLSLOPT.SRCS       := $(filter %.c,$(GLSLOPT.SRCS)) $(filter %.cc,$(GLSLOPT.SRCS)) $(filter %.cpp,$(GLSLOPT.SRCS))
+GLSLOPT.SRCS.NAMES := $(notdir $(GLSLOPT.SRCS))
+GLSLOPT.OBJS       := $(addprefix tmp/$(SYSTEM)/glslopt/static/,$(GLSLOPT.SRCS.NAMES))
+GLSLOPT.OBJS       := $(GLSLOPT.OBJS:.c=.o) $(GLSLOPT.OBJS:.cpp=.o)
+GLSLOPT.OBJS       := $(filter %.o,$(GLSLOPT.OBJS))
+GLSLOPT.DEPS       := $(GLSLOPT.OBJS:.o=.d)
+GLSLOPT.CFLAGS     := $(GLSLOPT.INCLUDE)
+# quiet build for this thirdparty code for now
+GLSLOPT.CFLAGS     += -Wno-ignored-qualifiers -Wno-sign-compare -Wno-unneeded-internal-declaration -Wno-overloaded-virtual -Wno-unused-private-field
+
+ifeq ($(MODE),release)
+GLSLOPT.CFLAGS  += -DNDEBUG
+GLSLOPT.CFLAGS  += -DREGAL_NO_ASSERT=1
+endif
+
+-include $(GLSLOPT.DEPS) #seth: do I need ot set this?
+
+glslopt.lib: lib/$(SYSTEM)/$(GLSLOPT.STATIC)
+
+glslopt.clean:
+	$(RM) -r tmp/$(SYSTEM)/glslopt/static
+	$(RM) -r lib/$(SYSTEM)/$(GLSLOPT.STATIC)
+
+tmp/$(SYSTEM)/glslopt/static/%.o: src/glsl/src/mesa/main/%.c
+	@mkdir -p $(dir $@)
+	$(LOG_CC)$(CCACHE) $(CC) $(CFLAGS) $(GLSLOPT.CFLAGS) $(PICFLAG) -o $@ -c $<
+
+tmp/$(SYSTEM)/glslopt/static/%.o: src/glsl/src/mesa/program/%.c
+	@mkdir -p $(dir $@)
+	$(LOG_CC)$(CCACHE) $(CC) $(CFLAGS) $(GLSLOPT.CFLAGS) $(PICFLAG) -o $@ -c $<
+
+tmp/$(SYSTEM)/glslopt/static/%.o: src/glsl/src/glsl/glcpp/%.c
+	@mkdir -p $(dir $@)
+	$(LOG_CC)$(CCACHE) $(CC) $(CFLAGS) $(GLSLOPT.CFLAGS) $(PICFLAG) -o $@ -c $<
+
+tmp/$(SYSTEM)/glslopt/static/%.o: src/glsl/src/glsl/%.c
+	@mkdir -p $(dir $@)
+	$(LOG_CC)$(CCACHE) $(CC) $(CFLAGS) $(GLSLOPT.CFLAGS) $(PICFLAG) -o $@ -c $<
+
+tmp/$(SYSTEM)/glslopt/static/%.o: src/glsl/src/glsl/%.cpp
+	@mkdir -p $(dir $@)
+	$(LOG_CXX)$(CCACHE) $(CXX) $(CFLAGS) $(GLSLOPT.CFLAGS) $(PICFLAG) -o $@ -c $<
+
+lib/$(SYSTEM)/$(GLSLOPT.STATIC): $(GLSLOPT.OBJS)
+	@mkdir -p $(dir $@)
+	$(LOG_AR)$(CCACHE) $(AR) cr $@ $(GLSLOPT.OBJS)
+ifneq ($(RANLIB),)
+	$(LOG_RANLIB)$(RANLIB) $@
+endif
+ifneq ($(STRIP),)
+	$(LOG_STRIP)$(STRIP) -x $@
+endif
+
+endif
+endif

Makefile.regal

@@ -192,20 +192,20 @@ REGAL.SDEPS          := $(LIBS.SOBJS:.o=.d)
 REGAL.LIBS           += $(LDFLAGS.X11)
 
 ifneq ($(filter linux%,$(SYSTEM)),)
-REGAL.SONAME := lib$(NAME).so.$(SO_MAJOR)
-REGAL.DEVLNK := lib$(NAME).so
-REGAL.SHARED := lib$(NAME).so.$(SO_VERSION)
-LDFLAGS.SO   := $(LDFLAGS.DYNAMIC) -Wl,-soname=$(REGAL.SONAME)
+REGAL.SONAME     := lib$(NAME).so.$(SO_MAJOR)
+REGAL.DEVLNK     := lib$(NAME).so
+REGAL.SHARED     := lib$(NAME).so.$(SO_VERSION)
+REGAL.LDFLAGS.SO := $(LDFLAGS.SO) $(LDFLAGS.DYNAMIC) -Wl,-soname=$(REGAL.SONAME)
 endif
 
 ifneq ($(filter darwin%,$(SYSTEM)),)
-REGAL.SONAME    := lib$(NAME).$(SO_MAJOR).dylib
-REGAL.DEVLNK    := lib$(NAME).dylib
-REGAL.SHARED    := lib$(NAME).$(SO_VERSION).dylib
-REGAL.FRAMEWORK := $(NAME)
-LDFLAGS.SO      := $(LDFLAGS.DYNAMIC) -current_version $(SO_VERSION) -compatibility_version $(SO_MAJOR)
-#LDFLAGS.SO     += -install_name $(REGAL_DEST)/lib/$(REGAL.SHARED) 
-REGAL.LDFLAGS   += -Wl,-reexport-lGLU -L/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries
+REGAL.SONAME     := lib$(NAME).$(SO_MAJOR).dylib
+REGAL.DEVLNK     := lib$(NAME).dylib
+REGAL.SHARED     := lib$(NAME).$(SO_VERSION).dylib
+REGAL.FRAMEWORK  := $(NAME)
+REGAL.LDFLAGS.SO := $(LDFLAGS.SO) $(LDFLAGS.DYNAMIC) -current_version $(SO_VERSION) -compatibility_version $(SO_MAJOR)
+#LDFLAGS.SO     += -install_name $(REGAL_DEST)/lib/$(REGAL.SHARED)
+REGAL.LDFLAGS    += -Wl,-reexport-lGLU -L/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries
 endif
 
 ifdef REGAL.STATIC
@@ -246,8 +246,8 @@ ifneq ($(STRIP),)
 	$(LOG_STRIP)$(STRIP) -x $@
 endif
 
-REGAL.SHARED.DEPEND :=  
-REGAL.SHARED.DEPEND += lib/$(SYSTEM)/$(LIBPNG.STATIC) lib/$(SYSTEM)/$(ZLIB.STATIC) 
+REGAL.SHARED.DEPEND :=
+REGAL.SHARED.DEPEND += lib/$(SYSTEM)/$(LIBPNG.STATIC) lib/$(SYSTEM)/$(ZLIB.STATIC)
 
 ifdef APITRACE.STATIC
 REGAL.SHARED.DEPEND += lib/$(SYSTEM)/$(APITRACE.STATIC) lib/$(SYSTEM)/$(SNAPPY.STATIC)
@@ -256,9 +256,9 @@ endif
 ifdef REGAL.SHARED
 lib/$(SYSTEM)/$(REGAL.SHARED): $(REGAL.SHARED.DEPEND) $(REGAL.SOBJS)
 ifdef APITRACE.STATIC
-	$(LOG_LD)$(CCACHE) $(LD) $(LDFLAGS.EXTRA) $(LDFLAGS.SO) -o $@ $(LDFLAGS.STARTGROUP) $(REGAL.SOBJS) lib/$(SYSTEM)/$(APITRACE.STATIC) $(LDFLAGS.ENDGROUP) $(REGAL.SHARED.DEPEND) $(REGAL.LIBS) $(REGAL.LDFLAGS)
+	$(LOG_LD)$(CCACHE) $(LD) $(LDFLAGS.EXTRA) $(REGAL.LDFLAGS.SO) -o $@ $(LDFLAGS.STARTGROUP) $(REGAL.SOBJS) lib/$(SYSTEM)/$(APITRACE.STATIC) $(LDFLAGS.ENDGROUP) $(REGAL.SHARED.DEPEND) $(REGAL.LIBS) $(REGAL.LDFLAGS)
 else
-	$(LOG_LD)$(CCACHE) $(LD) $(LDFLAGS.EXTRA) $(LDFLAGS.SO) -o $@ $(REGAL.SOBJS) $(REGAL.SHARED.DEPEND) $(REGAL.LIBS) $(REGAL.LDFLAGS)
+	$(LOG_LD)$(CCACHE) $(LD) $(LDFLAGS.EXTRA) $(REGAL.LDFLAGS.SO) -o $@ $(REGAL.SOBJS) $(REGAL.SHARED.DEPEND) $(REGAL.LIBS) $(REGAL.LDFLAGS)
 endif
 ifneq ($(LN),)
 	$(LN) $(REGAL.SHARED) lib/$(SYSTEM)/$(REGAL.SONAME)

Makefile.regaltest

@@ -59,9 +59,9 @@ tmp/$(SYSTEM)/regaltest/static/%.o: tests/%.cpp
 bin/$(SYSTEM)/regaltest$(BIN_EXTENSION): $(REGALTEST.OBJS) lib/$(SYSTEM)/$(GTEST.STATIC) lib/$(SYSTEM)/$(REGAL.STATIC) $(REGAL.SHARED.DEPEND)
 	@mkdir -p $(dir $@)
 ifdef APITRACE.STATIC
-	$(LOG_LD)$(CCACHE) $(LD) $(LDFLAGS.EXTRA) -o $@ $(REGALTEST.OBJS) $(REGALTEST.LIBS) $(LDFLAGS.STARTGROUP) lib/$(SYSTEM)/$(REGAL.STATIC) lib/$(SYSTEM)/$(APITRACE.STATIC) $(LDFLAGS.ENDGROUP) $(REGAL.SHARED.DEPEND) $(REGAL.LIBS) lib/$(SYSTEM)/$(GTEST.STATIC) $(REGAL.LDFLAGS) 
+	$(LOG_LD)$(CCACHE) $(LD) $(LDFLAGS.EXTRA) -o $@ $(REGALTEST.OBJS) $(REGALTEST.LIBS) $(LDFLAGS.STARTGROUP) lib/$(SYSTEM)/$(REGAL.STATIC) lib/$(SYSTEM)/$(APITRACE.STATIC) $(LDFLAGS.ENDGROUP) $(REGAL.SHARED.DEPEND) $(REGAL.LIBS) lib/$(SYSTEM)/$(GTEST.STATIC) $(REGAL.LDFLAGS)
 else
-	$(LOG_LD)$(CCACHE) $(LD) $(LDFLAGS.EXTRA) -o $@ $(REGALTEST.OBJS) $(REGALTEST.LIBS) lib/$(SYSTEM)/$(REGAL.STATIC) $(REGAL.SHARED.DEPEND) $(REGAL.LIBS) lib/$(SYSTEM)/$(GTEST.STATIC) $(REGAL.LDFLAGS) 
+	$(LOG_LD)$(CCACHE) $(LD) $(LDFLAGS.EXTRA) -o $@ $(REGALTEST.OBJS) $(REGALTEST.LIBS) lib/$(SYSTEM)/$(REGAL.STATIC) $(REGAL.SHARED.DEPEND) $(REGAL.LIBS) lib/$(SYSTEM)/$(GTEST.STATIC) $(REGAL.LDFLAGS)
 endif
 ifneq ($(STRIP),)
 	$(LOG_STRIP)$(STRIP) -x $@

Makefile.regalw

@@ -0,0 +1,167 @@
+ifndef MAKEFILE_REGALW_INCLUDED
+MAKEFILE_REGALW_INCLUDED := 1
+
+.PHONY: regalw.lib regalw.clean
+
+include build/common.inc
+
+include build/regal.inc
+
+#
+# Regal Wrangler
+#
+
+REGALW.STATIC    ?= libRegalW.a
+REGALW.SHARED    ?= libRegal.so
+
+# Static library target not yet supported
+
+REGALW.STATIC :=
+
+# Shared library target not currently supported for NaCL or emscripten
+
+ifneq ($(filter nacl% emscripten%,$(SYSTEM)),)
+REGALW.SHARED :=
+endif
+
+
+ifdef REGALW.SHARED
+
+all:: regalw.lib
+
+clean:: regalw.clean
+
+REGALW.LDFLAGS        := -lstdc++ -pthread -lm
+REGALW.LIBS           :=
+
+REGALW.SRCS           := $(REGAL.CXX)
+REGALW.SRCS           += src/md5/src/md5.c
+REGALW.SRCS           += src/jsonsl/jsonsl.c
+
+REGALW.CFLAGS         += -DREGAL_WRANGLER=1
+REGALW.INCLUDE        := $(REGAL.INCLUDE)
+
+# Optional flags
+
+ifeq ($(MODE),release)
+REGALW.CFLAGS       += -DNDEBUG
+#REGALW.CFLAGS       += -DREGAL_NO_TLS=0       # 1 for single threaded
+endif
+
+#
+# Flags for custom mode
+#
+
+ifeq ($(MODE),custom)
+endif
+
+
+REGALW.CFLAGS         += -fvisibility=hidden
+
+REGALW.SRCS.NAMES     := $(notdir $(REGALW.SRCS))
+
+REGALW.HEADERS        :=
+REGALW.HEADERS        += include/GL/Regal.h
+REGALW.HEADERS        += src/regal/RegalPrivate.h
+
+REGALW.OBJS           := $(addprefix tmp/$(SYSTEM)/regalw/static/,$(REGALW.SRCS.NAMES))
+REGALW.OBJS           := $(REGALW.OBJS:.c=.o)
+REGALW.OBJS           := $(REGALW.OBJS:.cpp=.o)
+REGALW.DEPS           := $(REGALW.OBJS:.o=.d)
+
+REGALW.SOBJS          := $(addprefix tmp/$(SYSTEM)/regalw/shared/,$(REGALW.SRCS.NAMES))
+REGALW.SOBJS          := $(REGALW.SOBJS:.c=.o)
+REGALW.SOBJS          := $(REGALW.SOBJS:.cpp=.o)
+REGALW.SDEPS          := $(LIBS.SOBJS:.o=.d)
+
+-include $(REGALW.DEPS) $(REGALW.SDEPS)
+
+REGALW.LIBS           += $(LDFLAGS.X11)
+
+ifneq ($(filter linux%,$(SYSTEM)),)
+REGALW.SONAME     := libRegalW.so.$(SO_MAJOR)
+REGALW.DEVLNK     := libRegalW.so
+REGALW.SHARED     := libRegalW.so.$(SO_VERSION)
+REGALW.LDFLAGS.SO := $(LDFLAGS.SO) $(LDFLAGS.DYNAMIC) -Wl,-soname=$(REGALW.SONAME)
+endif
+
+ifneq ($(filter darwin%,$(SYSTEM)),)
+REGALW.SONAME     := libRegalW.$(SO_MAJOR).dylib
+REGALW.DEVLNK     := libRegalW.dylib
+REGALW.SHARED     := libRegalW.$(SO_VERSION).dylib
+REGALW.FRAMEWORK  := RegalWrangler
+REGALW.LDFLAGS.SO := $(LDFLAGS.SO) $(LDFLAGS.DYNAMIC) -current_version $(SO_VERSION) -compatibility_version $(SO_MAJOR)
+REGALW.LDFLAGS    += -Wl,-reexport-lGLU -L/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries
+endif
+
+ifdef REGALW.STATIC
+regalw.lib: lib/$(SYSTEM)/$(REGALW.STATIC)
+endif
+
+ifdef REGALW.SHARED
+regalw.lib: lib/$(SYSTEM)/$(REGALW.SHARED)
+endif
+
+regalw.clean:
+	$(RM) -r tmp/$(SYSTEM)/regalw/static
+	$(RM) -r tmp/$(SYSTEM)/regalw/shared
+ifdef REGALW.STATIC
+	$(RM) -r lib/$(SYSTEM)/$(REGALW.STATIC)
+endif
+ifdef REGALW.SHARED
+	$(RM) -r bin/$(SYSTEM)/$(REGALW.SHARED)
+endif
+
+lib/$(SYSTEM)/$(REGALW.STATIC): $(REGALW.OBJS)
+	@mkdir -p $(dir $@)
+	$(LOG_AR)$(CCACHE) $(AR) cr $@ $(REGALW.OBJS)
+ifneq ($(RANLIB),)
+	$(LOG_RANLIB)$(RANLIB) $@
+endif
+ifneq ($(STRIP),)
+	$(LOG_STRIP)$(STRIP) -x $@
+endif
+
+REGALW.SHARED.DEPEND :=
+
+ifdef REGALW.SHARED
+lib/$(SYSTEM)/$(REGALW.SHARED): $(REGALW.SHARED.DEPEND) $(REGALW.SOBJS)
+	$(LOG_LD)$(CCACHE) $(LD) $(LDFLAGS.EXTRA) $(REGALW.LDFLAGS.SO) -o $@ $(REGALW.SOBJS) $(REGALW.SHARED.DEPEND) $(REGALW.LIBS) $(REGALW.LDFLAGS)
+ifneq ($(LN),)
+	$(LN) $(REGALW.SHARED) lib/$(SYSTEM)/$(REGALW.SONAME)
+	$(LN) $(REGALW.SHARED) lib/$(SYSTEM)/$(REGALW.DEVLNK)
+ifneq ($(REGALW.FRAMEWORK),)
+	$(LN) $(REGALW.SHARED) lib/$(SYSTEM)/$(REGALW.FRAMEWORK)
+endif
+endif
+ifneq ($(STRIP),)
+	$(LOG_STRIP)$(STRIP) -x $@
+endif
+endif
+
+tmp/$(SYSTEM)/regalw/static/%.o: src/regal/%.cpp $(REGALW.HEADERS)
+	@mkdir -p $(dir $@)
+	$(LOG_CXX)$(CCACHE) $(CXX) $(REGALW.CFLAGS) $(CFLAGS) $(CFLAGS.SO) $(REGALW.INCLUDE) -o $@ -c $<
+
+tmp/$(SYSTEM)/regalw/shared/%.o: src/regal/%.cpp $(REGALW.HEADERS)
+	@mkdir -p $(dir $@)
+	$(LOG_CXX)$(CCACHE) $(CXX) $(REGALW.CFLAGS) $(CFLAGS) $(PICFLAG) $(CFLAGS.SO) $(REGALW.INCLUDE) -o $@ -c $<
+
+tmp/$(SYSTEM)/regalw/static/%.o: src/md5/src/%.c $(REGALW.HEADERS)
+	@mkdir -p $(dir $@)
+	$(LOG_CC)$(CCACHE) $(CC) $(REGALW.CFLAGS) $(CFLAGS) $(CFLAGS.SO) $(REGALW.INCLUDE) -o $@ -c $<
+
+tmp/$(SYSTEM)/regalw/shared/%.o: src/md5/src/%.c $(REGALW.HEADERS)
+	@mkdir -p $(dir $@)
+	$(LOG_CC)$(CCACHE) $(CC) $(REGALW.CFLAGS) $(CFLAGS) $(PICFLAG) $(CFLAGS.SO) $(REGALW.INCLUDE) -o $@ -c $<
+
+tmp/$(SYSTEM)/regalw/static/%.o: src/jsonsl/%.c $(REGALW.HEADERS)
+	@mkdir -p $(dir $@)
+	$(LOG_CC)$(CCACHE) $(CC) $(REGALW.CFLAGS) $(CFLAGS) $(CFLAGS.SO) $(REGALW.INCLUDE) -o $@ -c $<
+
+tmp/$(SYSTEM)/regalw/shared/%.o: src/jsonsl/%.c $(REGALW.HEADERS)
+	@mkdir -p $(dir $@)
+	$(LOG_CC)$(CCACHE) $(CC) $(REGALW.CFLAGS) $(CFLAGS) $(PICFLAG) $(CFLAGS.SO) $(REGALW.INCLUDE) -o $@ -c $<
+
+endif
+endif

Makefile.tiger

@@ -35,7 +35,7 @@ tiger.clean:
 	$(RM) -r tmp/$(SYSTEM)/tiger/static
 	$(RM) -r bin/$(SYSTEM)/tiger
 
-TIGER.SRCS       += examples/tiger/nvpr_tiger.c	
+TIGER.SRCS       += examples/tiger/nvpr_tiger.c
 TIGER.SRCS       += examples/tiger/tiger.c
 TIGER.SRCS       += examples/tiger/xform.c
 TIGER.SRCS.NAMES := $(notdir $(TIGER.SRCS))
@@ -53,8 +53,8 @@ tmp/$(SYSTEM)/tiger/static/%.o: examples/tiger/%.c
 	@mkdir -p $(dir $@)
 	$(LOG_CC)$(CCACHE) $(CC) $(TIGER.CFLAGS) $(CFLAGS) $(CFLAGS.SO) -o $@ -c $<
 
-TIGER.DEPEND :=  
-TIGER.DEPEND += lib/$(SYSTEM)/$(REGAL.SHARED) 
+TIGER.DEPEND :=
+TIGER.DEPEND += lib/$(SYSTEM)/$(REGAL.SHARED)
 
 ifdef GLUT.SHARED
 bin/$(SYSTEM)/tiger: lib/$(SYSTEM)/$(GLUT.SHARED) lib/$(SYSTEM)/$(GLU.SHARED)