Avoid platform sed differences
This commit is contained in:
parent
d92c7493a6
commit
8e74119d0f
2 changed files with 60 additions and 5 deletions
14
Makefile
14
Makefile
|
@ -264,6 +264,7 @@ VORBISDIR=$(MOUNT_DIR)/libvorbis-1.3.6
|
||||||
OPUSDIR=$(MOUNT_DIR)/opus-1.2.1
|
OPUSDIR=$(MOUNT_DIR)/opus-1.2.1
|
||||||
OPUSFILEDIR=$(MOUNT_DIR)/opusfile-0.9
|
OPUSFILEDIR=$(MOUNT_DIR)/opusfile-0.9
|
||||||
ZDIR=$(MOUNT_DIR)/zlib
|
ZDIR=$(MOUNT_DIR)/zlib
|
||||||
|
TOOLSDIR=$(MOUNT_DIR)/tools
|
||||||
Q3ASMDIR=$(MOUNT_DIR)/tools/asm
|
Q3ASMDIR=$(MOUNT_DIR)/tools/asm
|
||||||
LBURGDIR=$(MOUNT_DIR)/tools/lcc/lburg
|
LBURGDIR=$(MOUNT_DIR)/tools/lcc/lburg
|
||||||
Q3CPPDIR=$(MOUNT_DIR)/tools/lcc/cpp
|
Q3CPPDIR=$(MOUNT_DIR)/tools/lcc/cpp
|
||||||
|
@ -1222,9 +1223,7 @@ endef
|
||||||
define DO_REF_STR
|
define DO_REF_STR
|
||||||
$(echo_cmd) "REF_STR $<"
|
$(echo_cmd) "REF_STR $<"
|
||||||
$(Q)rm -f $@
|
$(Q)rm -f $@
|
||||||
$(Q)echo "const char *fallbackShader_$(notdir $(basename $<)) =" >> $@
|
$(Q)$(STRINGIFY) $< $@
|
||||||
$(Q)cat $< | sed -e 's/^\(.*\)$$/\"\1\\n\"/' >> $@
|
|
||||||
$(Q)echo ";" >> $@
|
|
||||||
endef
|
endef
|
||||||
|
|
||||||
define DO_BOT_CC
|
define DO_BOT_CC
|
||||||
|
@ -1490,6 +1489,7 @@ Q3RCC = $(B)/tools/q3rcc$(TOOLS_BINEXT)
|
||||||
Q3CPP = $(B)/tools/q3cpp$(TOOLS_BINEXT)
|
Q3CPP = $(B)/tools/q3cpp$(TOOLS_BINEXT)
|
||||||
Q3LCC = $(B)/tools/q3lcc$(TOOLS_BINEXT)
|
Q3LCC = $(B)/tools/q3lcc$(TOOLS_BINEXT)
|
||||||
Q3ASM = $(B)/tools/q3asm$(TOOLS_BINEXT)
|
Q3ASM = $(B)/tools/q3asm$(TOOLS_BINEXT)
|
||||||
|
STRINGIFY = $(B)/tools/stringify$(TOOLS_BINEXT)
|
||||||
|
|
||||||
LBURGOBJ= \
|
LBURGOBJ= \
|
||||||
$(B)/tools/lburg/lburg.o \
|
$(B)/tools/lburg/lburg.o \
|
||||||
|
@ -1583,6 +1583,10 @@ $(Q3LCC): $(Q3LCCOBJ) $(Q3RCC) $(Q3CPP)
|
||||||
$(echo_cmd) "LD $@"
|
$(echo_cmd) "LD $@"
|
||||||
$(Q)$(TOOLS_CC) $(TOOLS_CFLAGS) $(TOOLS_LDFLAGS) -o $@ $(Q3LCCOBJ) $(TOOLS_LIBS)
|
$(Q)$(TOOLS_CC) $(TOOLS_CFLAGS) $(TOOLS_LDFLAGS) -o $@ $(Q3LCCOBJ) $(TOOLS_LIBS)
|
||||||
|
|
||||||
|
$(STRINGIFY): $(TOOLSDIR)/stringify.c
|
||||||
|
$(echo_cmd) "CC $@"
|
||||||
|
$(Q)$(TOOLS_CC) $(TOOLS_CFLAGS) $(TOOLS_LDFLAGS) -o $@ $(TOOLSDIR)/stringify.c $(TOOLS_LIBS)
|
||||||
|
|
||||||
define DO_Q3LCC
|
define DO_Q3LCC
|
||||||
$(echo_cmd) "Q3LCC $<"
|
$(echo_cmd) "Q3LCC $<"
|
||||||
$(Q)$(Q3LCC) $(BASEGAME_CFLAGS) -o $@ $<
|
$(Q)$(Q3LCC) $(BASEGAME_CFLAGS) -o $@ $<
|
||||||
|
@ -2725,7 +2729,7 @@ $(B)/renderergl1/%.o: $(RGL1DIR)/%.c
|
||||||
$(B)/renderergl1/tr_altivec.o: $(RGL1DIR)/tr_altivec.c
|
$(B)/renderergl1/tr_altivec.o: $(RGL1DIR)/tr_altivec.c
|
||||||
$(DO_REF_CC_ALTIVEC)
|
$(DO_REF_CC_ALTIVEC)
|
||||||
|
|
||||||
$(B)/renderergl2/glsl/%.c: $(RGL2DIR)/glsl/%.glsl
|
$(B)/renderergl2/glsl/%.c: $(RGL2DIR)/glsl/%.glsl $(STRINGIFY)
|
||||||
$(DO_REF_STR)
|
$(DO_REF_STR)
|
||||||
|
|
||||||
$(B)/renderergl2/glsl/%.o: $(B)/renderergl2/glsl/%.c
|
$(B)/renderergl2/glsl/%.o: $(B)/renderergl2/glsl/%.c
|
||||||
|
@ -2950,7 +2954,7 @@ toolsclean2:
|
||||||
@echo "TOOLS_CLEAN $(B)"
|
@echo "TOOLS_CLEAN $(B)"
|
||||||
@rm -f $(TOOLSOBJ)
|
@rm -f $(TOOLSOBJ)
|
||||||
@rm -f $(TOOLSOBJ_D_FILES)
|
@rm -f $(TOOLSOBJ_D_FILES)
|
||||||
@rm -f $(LBURG) $(DAGCHECK_C) $(Q3RCC) $(Q3CPP) $(Q3LCC) $(Q3ASM)
|
@rm -f $(LBURG) $(DAGCHECK_C) $(Q3RCC) $(Q3CPP) $(Q3LCC) $(Q3ASM) $(STRINGIFY)
|
||||||
|
|
||||||
distclean: clean toolsclean
|
distclean: clean toolsclean
|
||||||
@rm -rf $(BUILD_DIR)
|
@rm -rf $(BUILD_DIR)
|
||||||
|
|
51
code/tools/stringify.c
Normal file
51
code/tools/stringify.c
Normal file
|
@ -0,0 +1,51 @@
|
||||||
|
#include <stdio.h>
|
||||||
|
#include <ctype.h>
|
||||||
|
#include <string.h>
|
||||||
|
#include <libgen.h>
|
||||||
|
|
||||||
|
int main(int argc, char **argv)
|
||||||
|
{
|
||||||
|
FILE *ifp;
|
||||||
|
FILE *ofp;
|
||||||
|
char buffer[1024];
|
||||||
|
|
||||||
|
if(argc < 3)
|
||||||
|
return 1;
|
||||||
|
|
||||||
|
char *inFile = argv[1];
|
||||||
|
char *outFile = argv[2];
|
||||||
|
|
||||||
|
ifp = fopen(inFile, "r");
|
||||||
|
if(!ifp)
|
||||||
|
return 2;
|
||||||
|
|
||||||
|
ofp = fopen(outFile, "w");
|
||||||
|
if(!ofp)
|
||||||
|
return 3;
|
||||||
|
|
||||||
|
// Strip extension
|
||||||
|
char *base = basename(inFile);
|
||||||
|
*strrchr(base, '.') = '\0';
|
||||||
|
|
||||||
|
fprintf(ofp, "const char *fallbackShader_%s =\n", base);
|
||||||
|
|
||||||
|
while(fgets(buffer, sizeof(buffer), ifp))
|
||||||
|
{
|
||||||
|
// Strip trailing whitespace from line
|
||||||
|
char *end = buffer + strlen(buffer) - 1;
|
||||||
|
while(end >= buffer && isspace(*end))
|
||||||
|
end--;
|
||||||
|
|
||||||
|
end[1] = '\0';
|
||||||
|
|
||||||
|
// Write line enquoted, with a newline
|
||||||
|
fprintf(ofp, "\"%s\\n\"\n", buffer);
|
||||||
|
}
|
||||||
|
|
||||||
|
fprintf(ofp, ";\n");
|
||||||
|
|
||||||
|
fclose(ifp);
|
||||||
|
fclose(ofp);
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
Loading…
Add table
Add a link
Reference in a new issue