diff --git a/linux/Makefile b/linux/Makefile index fb8e7e35..421ea27d 100644 --- a/linux/Makefile +++ b/linux/Makefile @@ -5,7 +5,7 @@ SYS := $(shell gcc -dumpmachine) CFLAGS = -O3 -std=gnu99 INCLUDE = -I../src/gpacmp4/ -I../src/libpng -I../src/lib_hash -I../src/zlib -I../src/lib_ccx -I../src/. INCLUDE += -I../src/zvbi -ALL_FLAGS = -Wno-write-strings -D_FILE_OFFSET_BITS=64 +ALL_FLAGS = -Wno-write-strings -D_FILE_OFFSET_BITS=64 -DVERSION_FILE_PRESENT LDFLAGS = -lm ifneq (, $(findstring linux, $(SYS))) diff --git a/linux/build b/linux/build index f2db00df..d12685ec 100755 --- a/linux/build +++ b/linux/build @@ -1,5 +1,5 @@ #!/bin/bash -BLD_FLAGS="-std=gnu99 -Wno-write-strings -DGPAC_CONFIG_LINUX -D_FILE_OFFSET_BITS=64" +BLD_FLAGS="-std=gnu99 -Wno-write-strings -DGPAC_CONFIG_LINUX -D_FILE_OFFSET_BITS=64 -DVERSION_FILE_PRESENT" BLD_INCLUDE="-I../src/lib_ccx/ -I../src/gpacmp4/ -I../src/libpng/ -I../src/zlib/ -I../src/zvbi -I../src/lib_hash" SRC_LIBPNG="$(find ../src/libpng/ -name '*.c')" SRC_ZLIB="$(find ../src/zlib/ -name '*.c')" diff --git a/linux/builddebug b/linux/builddebug index 590e7fea..f945f21b 100755 --- a/linux/builddebug +++ b/linux/builddebug @@ -1,5 +1,5 @@ #!/bin/bash -BLD_FLAGS="-g -std=gnu99 -Wno-write-strings -DGPAC_CONFIG_LINUX -D_FILE_OFFSET_BITS=64" +BLD_FLAGS="-g -std=gnu99 -Wno-write-strings -DGPAC_CONFIG_LINUX -D_FILE_OFFSET_BITS=64 -DVERSION_FILE_PRESENT" BLD_INCLUDE="-I../src/lib_ccx/ -I../src/gpacmp4/ -I../src/libpng/ -I../src/zlib/ -I../src/zvbi -I../src/lib_hash" SRC_LIBPNG="$(find ../src/libpng/ -name '*.c')" SRC_ZLIB="$(find ../src/zlib/ -name '*.c')" diff --git a/linux/pre-build.sh b/linux/pre-build.sh index 87094483..ebf6059a 100755 --- a/linux/pre-build.sh +++ b/linux/pre-build.sh @@ -25,10 +25,10 @@ builddate=`date +%Y-%m-%d` echo "Storing variables in file" echo "Commit: $commit" echo "Date: $builddate" -echo "#ifndef CCX_CCEXTRACTOR_COMPILE_H" > ../src/lib_ccx/compile_info.h -echo "#define CCX_CCEXTRACTOR_COMPILE_H" >> ../src/lib_ccx/compile_info.h -echo "#define GIT_COMMIT \"$commit\"" >> ../src/lib_ccx/compile_info.h -echo "#define COMPILE_DATE \"$builddate\"" >> ../src/lib_ccx/compile_info.h -echo "#endif" >> ../src/lib_ccx/compile_info.h +echo "#ifndef CCX_CCEXTRACTOR_COMPILE_REAL_H" > ../src/lib_ccx/compile_info_real.h +echo "#define CCX_CCEXTRACTOR_COMPILE_REAL_H" >> ../src/lib_ccx/compile_info_real.h +echo "#define GIT_COMMIT \"$commit\"" >> ../src/lib_ccx/compile_info_real.h +echo "#define COMPILE_DATE \"$builddate\"" >> ../src/lib_ccx/compile_info_real.h +echo "#endif" >> ../src/lib_ccx/compile_info_real.h echo "Stored all in compile.h" echo "Done." diff --git a/mac/build.command b/mac/build.command index d5f8b7d7..99abc202 100755 --- a/mac/build.command +++ b/mac/build.command @@ -1,6 +1,6 @@ #!/bin/bash cd `dirname $0` -BLD_FLAGS="-std=gnu99 -Wno-write-strings -DGPAC_CONFIG_DARWIN -D_FILE_OFFSET_BITS=64 -Dfopen64=fopen -Dopen64=open -Dlseek64=lseek" +BLD_FLAGS="-std=gnu99 -Wno-write-strings -DGPAC_CONFIG_DARWIN -D_FILE_OFFSET_BITS=64 -DVERSION_FILE_PRESENT -Dfopen64=fopen -Dopen64=open -Dlseek64=lseek" BLD_INCLUDE="-I../src/lib_ccx -I../src/gpacmp4 -I../src/libpng -I../src/zlib -I../src/zvbi -I../src/lib_hash" SRC_LIBPNG="$(find ../src/libpng -name '*.c')" SRC_ZLIB="$(find ../src/zlib -name '*.c')" diff --git a/mac/pre-build.sh b/mac/pre-build.sh index 87094483..ebf6059a 100755 --- a/mac/pre-build.sh +++ b/mac/pre-build.sh @@ -25,10 +25,10 @@ builddate=`date +%Y-%m-%d` echo "Storing variables in file" echo "Commit: $commit" echo "Date: $builddate" -echo "#ifndef CCX_CCEXTRACTOR_COMPILE_H" > ../src/lib_ccx/compile_info.h -echo "#define CCX_CCEXTRACTOR_COMPILE_H" >> ../src/lib_ccx/compile_info.h -echo "#define GIT_COMMIT \"$commit\"" >> ../src/lib_ccx/compile_info.h -echo "#define COMPILE_DATE \"$builddate\"" >> ../src/lib_ccx/compile_info.h -echo "#endif" >> ../src/lib_ccx/compile_info.h +echo "#ifndef CCX_CCEXTRACTOR_COMPILE_REAL_H" > ../src/lib_ccx/compile_info_real.h +echo "#define CCX_CCEXTRACTOR_COMPILE_REAL_H" >> ../src/lib_ccx/compile_info_real.h +echo "#define GIT_COMMIT \"$commit\"" >> ../src/lib_ccx/compile_info_real.h +echo "#define COMPILE_DATE \"$builddate\"" >> ../src/lib_ccx/compile_info_real.h +echo "#endif" >> ../src/lib_ccx/compile_info_real.h echo "Stored all in compile.h" echo "Done."