Changeset 1924Tweet

Timestamp:

Sep 17, 2012, 2:30:54 PM (11 years ago)

Author:

sam

Message:

build: refactor lolfx build rule into common.am.

Location:

trunk

Files:

• build/autotools/common.am (modified) (1 diff)
• configure.ac (modified) (1 diff)
• src/Makefile.am (modified) (1 diff)
• tools/neercs/Makefile.am (modified) (1 diff)
• tutorial/Makefile.am (modified) (1 diff)

trunk/build/autotools/common.am

@@ -16 +16 @@
 .PHONY: lolcheck bench
 
+SUFFIXES = .lolfx
+.lolfx.o:
+        (echo "char const *"; \
+         echo "lolfx_$(notdir $(basename $(filter %.lolfx, $^))) ="; \
+         $(SED) 's/"/\\"/g' $(filter %.lolfx, $^) | $(SED) 's/\([^\r]*\).*/"\1\\n"/'; \
+         echo ";") \
+        | $(CXXCOMPILE) -xc++ -c - -o $@
+

trunk/configure.ac

@@ -442 +442 @@
 
 
-dnl  LolFx compilation rule
-LOLFX_BUILD='(echo "char const *"; echo "lolfx_$(notdir $(basename $(filter %.lolfx, $^))) ="; $(SED) '"'"'s/"/\\"/g'"'"' $(filter %.lolfx, $^) | $(SED) '"'"'s/\([[^\r]]*\).*/"\1\\n"/'"'"'; echo ";") | $(CXXCOMPILE) -xc++ -c - -o $@'
-AC_SUBST(LOLFX_BUILD)
-
-
 dnl Extra libraries we may need
 AC_SUBST(MATH_LIBS)

trunk/src/Makefile.am

@@ -70 +70 @@
     debug/record.cpp debug/record.h debug/stats.cpp debug/stats.h
 liblol_a_CPPFLAGS = @LOL_CFLAGS@ -Ibullet
-
-SUFFIXES = .lolfx
-.lolfx.o:
-        $(LOLFX_BUILD)
 
 if TRUE

trunk/tools/neercs/Makefile.am

@@ -36 +36 @@
              $(noinst_PROGRAMS:%$(EXEEXT)=%.exe)
 
-SUFFIXES = .lolfx
-.lolfx.o:
-        $(LOLFX_BUILD)
-
 old_sources = \
     old/actions.c \

trunk/tutorial/Makefile.am

@@ -12 +12 @@
              $(noinst_PROGRAMS:%$(EXEEXT)=%.elf) \
              $(noinst_PROGRAMS:%$(EXEEXT)=%.exe)
-
-SUFFIXES = .lolfx
-.lolfx.o:
-        $(LOLFX_BUILD)
 
 noinst_PROGRAMS = 01_triangle 02_cube 03_noise 05_easymesh 08_fbo 11_fractal