diff options
| author | Josh Coalson <jcoalson@users.sourceforce.net> | 2003-09-15 21:14:26 +0000 |
|---|---|---|
| committer | Josh Coalson <jcoalson@users.sourceforce.net> | 2003-09-15 21:14:26 +0000 |
| commit | 5b782b4da6897b75a24026fec88ab3110f9285ea (patch) | |
| tree | fdf0fae74573d9f284151d7a872e85cc10842ac8 /build | |
| parent | e51f3629187cbff75a042b67e84e90bc54f8b7e9 (diff) | |
| download | flac-5b782b4da6897b75a24026fec88ab3110f9285ea.tar.gz | |
replace the compile time ordinals.h.in->ordinals.h conversion with a static ordinals.h
Diffstat (limited to 'build')
| -rw-r--r-- | build/config.mk | 12 | ||||
| -rw-r--r-- | build/exe.mk | 6 | ||||
| -rw-r--r-- | build/lib.mk | 6 | ||||
| -rwxr-xr-x | build/project_builder_prebuild_phase.sh | 3 |
4 files changed, 8 insertions, 19 deletions
diff --git a/build/config.mk b/build/config.mk index 1a1c1f89..5d4ed62a 100644 --- a/build/config.mk +++ b/build/config.mk @@ -37,14 +37,4 @@ all default: $(DEFAULT_BUILD) VERSION=\"1.1.0\" -ORDINALS_H = $(topdir)/include/FLAC/ordinals.h - -$(ORDINALS_H): $(ORDINALS_H).in - sed \ - -e "s/@FLaC__SIZE16@/short/g" \ - -e "s/@FLaC__SIZE32@/int/g" \ - -e "s/@FLaC__SIZE64@/long long/g" \ - -e "s/@FLaC__USIZE16@/unsigned short/g" \ - -e "s/@FLaC__USIZE32@/unsigned int/g" \ - -e "s/@FLaC__USIZE64@/unsigned long long/g" \ - $< > $@ +CONFIG_CFLAGS=-DHAVE_INTTYPES_H diff --git a/build/exe.mk b/build/exe.mk index 49dfd1b4..15093814 100644 --- a/build/exe.mk +++ b/build/exe.mk @@ -45,9 +45,9 @@ PROGRAM = $(BINPATH)/$(PROGRAM_NAME) DEBUG_PROGRAM = $(DEBUG_BINPATH)/$(PROGRAM_NAME) RELEASE_PROGRAM = $(RELEASE_BINPATH)/$(PROGRAM_NAME) -debug : CFLAGS = -g -O0 -DDEBUG $(DEBUG_CFLAGS) -Wall -W -DVERSION=$(VERSION) $(DEFINES) $(INCLUDES) -valgrind: CFLAGS = -g -O0 -DDEBUG $(DEBUG_CFLAGS) -DFLAC__VALGRIND_TESTING -Wall -W -DVERSION=$(VERSION) $(DEFINES) $(INCLUDES) -release : CFLAGS = -O3 -fomit-frame-pointer -funroll-loops -finline-functions -DNDEBUG $(RELEASE_CFLAGS) -Wall -W -Winline -DFLaC__INLINE=__inline__ -DVERSION=$(VERSION) $(DEFINES) $(INCLUDES) +debug : CFLAGS = -g -O0 -DDEBUG $(CONFIG_CFLAGS) $(DEBUG_CFLAGS) -Wall -W -DVERSION=$(VERSION) $(DEFINES) $(INCLUDES) +valgrind: CFLAGS = -g -O0 -DDEBUG $(CONFIG_CFLAGS) $(DEBUG_CFLAGS) -DFLAC__VALGRIND_TESTING -Wall -W -DVERSION=$(VERSION) $(DEFINES) $(INCLUDES) +release : CFLAGS = -O3 -fomit-frame-pointer -funroll-loops -finline-functions -DNDEBUG $(CONFIG_CFLAGS) $(RELEASE_CFLAGS) -Wall -W -Winline -DFLaC__INLINE=__inline__ -DVERSION=$(VERSION) $(DEFINES) $(INCLUDES) LFLAGS = -L$(LIBPATH) diff --git a/build/lib.mk b/build/lib.mk index 81af6646..9da9af11 100644 --- a/build/lib.mk +++ b/build/lib.mk @@ -55,9 +55,9 @@ else LINKD = $(CC) -shared endif -debug : CFLAGS = -g -O0 -DDEBUG $(DEBUG_CFLAGS) -Wall -W -DVERSION=$(VERSION) $(DEFINES) $(INCLUDES) -valgrind: CFLAGS = -g -O0 -DDEBUG $(DEBUG_CFLAGS) -DFLAC__VALGRIND_TESTING -Wall -W -DVERSION=$(VERSION) $(DEFINES) $(INCLUDES) -release : CFLAGS = -O3 -fomit-frame-pointer -funroll-loops -finline-functions -DNDEBUG $(RELEASE_CFLAGS) -Wall -W -Winline -DFLaC__INLINE=__inline__ -DVERSION=$(VERSION) $(DEFINES) $(INCLUDES) +debug : CFLAGS = -g -O0 -DDEBUG $(CONFIG_CFLAGS) $(DEBUG_CFLAGS) -Wall -W -DVERSION=$(VERSION) $(DEFINES) $(INCLUDES) +valgrind: CFLAGS = -g -O0 -DDEBUG $(CONFIG_CFLAGS) -DFLAC__VALGRIND_TESTING -Wall -W -DVERSION=$(VERSION) $(DEFINES) $(INCLUDES) +release : CFLAGS = -O3 -fomit-frame-pointer -funroll-loops -finline-functions -DNDEBUG $(CONFIG_CFLAGS) $(RELEASE_CFLAGS) -Wall -W -Winline -DFLaC__INLINE=__inline__ -DVERSION=$(VERSION) $(DEFINES) $(INCLUDES) LFLAGS = -L$(LIBPATH) diff --git a/build/project_builder_prebuild_phase.sh b/build/project_builder_prebuild_phase.sh index 54747021..27ba77dd 100755 --- a/build/project_builder_prebuild_phase.sh +++ b/build/project_builder_prebuild_phase.sh @@ -1,2 +1 @@ -cd include/FLAC -sed -e 's/@FLaC__SIZE16@/short/g' -e 's/@FLaC__SIZE32@/int/g' -e 's/@FLaC__SIZE64@/long long/g' -e 's/@FLaC__USIZE16@/unsigned short/g' -e 's/@FLaC__USIZE32@/unsigned int/g' -e 's/@FLaC__USIZE64@/unsigned long long/g' ordinals.h.in > ordinals.h +true |