Move some things into renderercommon

ioquake · Feb 16, 2013 · 93e6183 · 93e6183
1 parent 372b07a
commit 93e6183
Show file tree

Hide file tree

Showing 13 changed files with 13 additions and 3,776 deletions.
diff --git a/Makefile b/Makefile
@@ -211,6 +211,7 @@ BD=$(BUILD_DIR)/debug-$(PLATFORM)-$(ARCH)
 BR=$(BUILD_DIR)/release-$(PLATFORM)-$(ARCH)
 CDIR=$(MOUNT_DIR)/client
 SDIR=$(MOUNT_DIR)/server
+RCOMMONDIR=$(MOUNT_DIR)/renderercommon
 RGL1DIR=$(MOUNT_DIR)/renderergl1
 RGL2DIR=$(MOUNT_DIR)/renderergl2
 CMDIR=$(MOUNT_DIR)/qcommon
@@ -2355,6 +2356,9 @@ $(B)/renderergl1/%.o: $(SDLDIR)/%.c
 $(B)/renderergl1/%.o: $(JPDIR)/%.c
 	$(DO_REF_CC)
 
+$(B)/renderergl1/%.o: $(RCOMMONDIR)/%.c
+	$(DO_REF_CC)
+
 $(B)/renderergl1/%.o: $(RGL1DIR)/%.c
 	$(DO_REF_CC)
 
@@ -2364,6 +2368,9 @@ $(B)/renderergl2/glsl/%.c: $(RGL2DIR)/glsl/%.glsl
 $(B)/renderergl2/glsl/%.o: $(B)/renderergl2/glsl/%.c
 	$(DO_REF_CC)
 
+$(B)/renderergl2/%.o: $(RCOMMONDIR)/%.c
+	$(DO_REF_CC)
+
 $(B)/renderergl2/%.o: $(RGL2DIR)/%.c
 	$(DO_REF_CC)
 

diff --git a/code/renderergl1/tr_image_bmp.c → code/renderercommon/tr_image_bmp.c b/code/renderergl1/tr_image_bmp.c → code/renderercommon/tr_image_bmp.c
@@ -20,7 +20,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
 
-#include "tr_local.h"
+#include "../renderergl1/tr_local.h"
 
 typedef struct
 {

diff --git a/code/renderergl1/tr_image_jpg.c → code/renderercommon/tr_image_jpg.c b/code/renderergl1/tr_image_jpg.c → code/renderercommon/tr_image_jpg.c
@@ -20,7 +20,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
 
-#include "tr_local.h"
+#include "../renderergl1/tr_local.h"
 
 /*
  * Include file for users of JPEG library.

diff --git a/code/renderergl1/tr_image_pcx.c → code/renderercommon/tr_image_pcx.c b/code/renderergl1/tr_image_pcx.c → code/renderercommon/tr_image_pcx.c
@@ -21,7 +21,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
 
-#include "tr_local.h"
+#include "../renderergl1/tr_local.h"
 
 /*
 ========================================================================

diff --git a/code/renderergl1/tr_image_png.c → code/renderercommon/tr_image_png.c b/code/renderergl1/tr_image_png.c → code/renderercommon/tr_image_png.c
@@ -19,7 +19,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 ===========================================================================
 */
 
-#include "tr_local.h"
+#include "../renderergl1/tr_local.h"
 
 #include "../qcommon/puff.h"
 

diff --git a/code/renderergl1/tr_image_tga.c → code/renderercommon/tr_image_tga.c b/code/renderergl1/tr_image_tga.c → code/renderercommon/tr_image_tga.c
@@ -20,7 +20,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
 
-#include "tr_local.h"
+#include "../renderergl1/tr_local.h"
 
 /*
 ========================================================================

diff --git a/code/renderergl1/tr_noise.c → code/renderercommon/tr_noise.c b/code/renderergl1/tr_noise.c → code/renderercommon/tr_noise.c
@@ -20,7 +20,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 ===========================================================================
 */
 // tr_noise.c
-#include "tr_local.h"
+#include "../renderergl1/tr_local.h"
 
 #define NOISE_SIZE 256
 #define NOISE_MASK ( NOISE_SIZE - 1 )

diff --git a/code/renderergl2/tr_image_bmp.c b/code/renderergl2/tr_image_bmp.c