Some Makefile changes

- make.bat: Use other GCC64/GPP64 defaults
- make.bat and Makefiles: No -fsched-spec-load, older compilers don't
support it
- make.bat and Makefiles: Use -std=c99 and -std=c++11 to make sure
everything compiles correct on different compilers
This commit is contained in:
Christian Schneider 2017-01-02 09:50:45 +01:00
parent 6abf077c27
commit b0e9d813b6
4 changed files with 9 additions and 9 deletions

View file

@ -6,7 +6,7 @@ PACKMP3_OBJ = contrib/packmp3/huffmp3.o contrib/packmp3/packmp3.o
ZLIB_OBJ = contrib/zlib/adler32.o contrib/zlib/crc32.o contrib/zlib/zutil.o contrib/zlib/trees.o contrib/zlib/inftrees.o contrib/zlib/inffast.o contrib/zlib/inflate.o contrib/zlib/deflate.o
LIBLZMA_OBJ = contrib/liblzma/alone_decoder.o contrib/liblzma/alone_encoder.o contrib/liblzma/arm.o contrib/liblzma/armthumb.o contrib/liblzma/auto_decoder.o contrib/liblzma/block_buffer_decoder.o contrib/liblzma/block_buffer_encoder.o contrib/liblzma/block_decoder.o contrib/liblzma/block_encoder.o contrib/liblzma/block_header_decoder.o contrib/liblzma/block_header_encoder.o contrib/liblzma/block_util.o contrib/liblzma/check.o contrib/liblzma/common.o contrib/liblzma/crc32_table.o contrib/liblzma/crc32_fast.o contrib/liblzma/crc64_table.o contrib/liblzma/crc64_fast.o contrib/liblzma/delta_common.o contrib/liblzma/delta_decoder.o contrib/liblzma/delta_encoder.o contrib/liblzma/easy_buffer_encoder.o contrib/liblzma/easy_decoder_memusage.o contrib/liblzma/easy_encoder.o contrib/liblzma/easy_encoder_memusage.o contrib/liblzma/easy_preset.o contrib/liblzma/fastpos_table.o contrib/liblzma/filter_buffer_decoder.o contrib/liblzma/filter_buffer_encoder.o contrib/liblzma/filter_common.o contrib/liblzma/filter_decoder.o contrib/liblzma/filter_encoder.o contrib/liblzma/filter_flags_decoder.o contrib/liblzma/filter_flags_encoder.o contrib/liblzma/hardware_cputhreads.o contrib/liblzma/hardware_physmem.o contrib/liblzma/ia64.o contrib/liblzma/index.o contrib/liblzma/index_decoder.o contrib/liblzma/index_encoder.o contrib/liblzma/index_hash.o contrib/liblzma/lzma2_decoder.o contrib/liblzma/lzma2_encoder.o contrib/liblzma/lzma_decoder.o contrib/liblzma/lzma_encoder.o contrib/liblzma/lzma_encoder_optimum_fast.o contrib/liblzma/lzma_encoder_optimum_normal.o contrib/liblzma/lzma_encoder_presets.o contrib/liblzma/lz_decoder.o contrib/liblzma/lz_encoder.o contrib/liblzma/lz_encoder_mf.o contrib/liblzma/outqueue.o contrib/liblzma/powerpc.o contrib/liblzma/price_table.o contrib/liblzma/sha256.o contrib/liblzma/simple_coder.o contrib/liblzma/simple_decoder.o contrib/liblzma/simple_encoder.o contrib/liblzma/sparc.o contrib/liblzma/stream_decoder.o contrib/liblzma/stream_buffer_encoder.o contrib/liblzma/stream_buffer_decoder.o contrib/liblzma/stream_encoder.o contrib/liblzma/stream_flags_decoder.o contrib/liblzma/stream_encoder_mt.o contrib/liblzma/stream_flags_common.o contrib/liblzma/stream_flags_encoder.o contrib/liblzma/tuklib_cpucores.o contrib/liblzma/tuklib_physmem.o contrib/liblzma/vli_decoder.o contrib/liblzma/vli_encoder.o contrib/liblzma/vli_size.o contrib/liblzma/x86.o
LIBLZMA_CPP = contrib/liblzma/compress_easy_mt.cpp
CFLAGS = -DUNIX -D_FILE_OFFSET_BITS=64 -O2 -Wall -pthread
CFLAGS = -std=c++11 -DUNIX -D_FILE_OFFSET_BITS=64 -O2 -Wall -pthread
.PHONY: all
all: contrib $(PROGNAME)

View file

@ -1,4 +1,4 @@
CFLAGS = -g -c -DHAVE__BOOL -DUNIX -D_FILE_OFFSET_BITS=64 -O2 -Wno-implicit-function-declaration -pthread
CFLAGS = -g -c -std=c99 -DHAVE__BOOL -DUNIX -D_FILE_OFFSET_BITS=64 -O2 -Wno-implicit-function-declaration -pthread
LIBLZMA_INCLUDES = -Iapi/ -Icheck/ -Icommon/ -Idelta/ -Ilz/ -Ilzma/ -Irangecoder/ -Isimple/
LIBLZMA_C = common/tuklib_physmem.c common/tuklib_cpucores.c common/common.c common/block_util.c common/easy_preset.c common/filter_common.c common/hardware_physmem.c common/index.c common/stream_flags_common.c common/vli_size.c common/alone_encoder.c common/block_buffer_encoder.c common/block_encoder.c common/block_header_encoder.c common/easy_buffer_encoder.c common/easy_encoder.c common/easy_encoder_memusage.c common/filter_buffer_encoder.c common/filter_encoder.c common/filter_flags_encoder.c common/index_encoder.c common/stream_buffer_encoder.c common/stream_encoder.c common/stream_flags_encoder.c common/vli_encoder.c common/hardware_cputhreads.c common/outqueue.c common/stream_encoder_mt.c common/alone_decoder.c common/auto_decoder.c common/block_buffer_decoder.c common/block_decoder.c common/block_header_decoder.c common/easy_decoder_memusage.c common/filter_buffer_decoder.c common/filter_decoder.c common/filter_flags_decoder.c common/index_decoder.c common/index_hash.c common/stream_decoder.c common/stream_buffer_decoder.c common/stream_flags_decoder.c common/vli_decoder.c check/check.c check/crc32_table.c check/crc32_fast.c check/crc64_table.c check/crc64_fast.c check/sha256.c lz/lz_encoder.c lz/lz_encoder_mf.c lz/lz_decoder.c lzma/lzma_encoder.c lzma/lzma_encoder_presets.c lzma/lzma_encoder_optimum_fast.c lzma/lzma_encoder_optimum_normal.c lzma/fastpos_table.c lzma/lzma_decoder.c lzma/lzma2_encoder.c lzma/lzma2_decoder.c rangecoder/price_table.c delta/delta_common.c delta/delta_encoder.c delta/delta_decoder.c simple/simple_coder.c simple/simple_encoder.c simple/simple_decoder.c simple/x86.c simple/powerpc.c simple/ia64.c simple/arm.c simple/armthumb.c simple/sparc.c

View file

@ -1,5 +1,5 @@
OBJECTS = huffmp3.o packmp3.o
CFLAGS = -O3 -DUNIX -DBUILD_LIB -Wall -pedantic -funroll-loops -ffast-math -fsched-spec-load -fomit-frame-pointer
CFLAGS = -O3 -DUNIX -DBUILD_LIB -Wall -pedantic -funroll-loops -ffast-math -fomit-frame-pointer
.PHONY: all
all: $(OBJECTS)

View file

@ -11,8 +11,8 @@ REM if nothing was changed in the "contrib" folder
REM gcc/g++ 32-bit/64-bit commands - change them according to your environment
set GCC32=gcc
set GPP32=g++
set GCC64=gcc
set GPP64=g++
set GCC64=x86_64-w64-mingw32-gcc
set GPP64=x86_64-w64-mingw32-g++
set EXE1=precomp
set EXE2=
@ -74,7 +74,7 @@ echo Building bzip...
%GCC% %MPARAM% -c -O2 -s -fomit-frame-pointer -Wall %BZIP%
echo Building packJPG...
pushd contrib\packjpg
%GPP% %MPARAM% -c -O3 -DBUILD_LIB -Wall -Wno-misleading-indentation -pedantic -funroll-loops -ffast-math -fsched-spec-load -fomit-frame-pointer aricoder.cpp bitops.cpp packjpg.cpp
%GPP% %MPARAM% -c -O3 -DBUILD_LIB -Wall -Wno-misleading-indentation -pedantic -funroll-loops -ffast-math -fomit-frame-pointer aricoder.cpp bitops.cpp packjpg.cpp
move /Y aricoder.o ..\..\ > nul
move /Y bitops.o ..\..\ > nul
move /Y packjpg.o ..\..\ > nul
@ -83,7 +83,7 @@ echo Building packMP3...
pushd contrib\packmp3
copy ..\packjpg\aricoder.* > nul
copy ..\packjpg\bitops.* > nul
%GPP% %MPARAM% -c -O3 -DBUILD_LIB -Wall -Wno-misleading-indentation -pedantic -funroll-loops -ffast-math -fsched-spec-load -fomit-frame-pointer aricoder.cpp bitops.cpp huffmp3.cpp packmp3.cpp
%GPP% %MPARAM% -c -O3 -DBUILD_LIB -Wall -Wno-misleading-indentation -pedantic -funroll-loops -ffast-math -fomit-frame-pointer aricoder.cpp bitops.cpp huffmp3.cpp packmp3.cpp
move /Y huffmp3.o ..\..\ > nul
move /Y packmp3.o ..\..\ > nul
if exist aricoder.* del aricoder.*
@ -111,12 +111,12 @@ set LIBLZMA=%LIBLZMA% lzma\lzma_decoder.c lzma\lzma2_encoder.c lzma\lzma2_decode
set LIBLZMA=%LIBLZMA% delta\delta_common.c delta\delta_encoder.c delta\delta_decoder.c simple\simple_coder.c
set LIBLZMA=%LIBLZMA% simple\simple_encoder.c simple\simple_decoder.c simple\x86.c simple\powerpc.c simple\ia64.c
set LIBLZMA=%LIBLZMA% simple\arm.c simple\armthumb.c simple\sparc.c
%GCC% %MPARAM% -c -O2 -s -fomit-frame-pointer -Iapi\ -Icheck\ -Icommon\ -Idelta\ -Ilz\ -Ilzma\ -Irangecoder\ -Isimple\ -Wno-implicit-function-declaration -DHAVE__BOOL %LIBLZMA%
%GCC% %MPARAM% -std=c99 -c -O2 -s -fomit-frame-pointer -Iapi\ -Icheck\ -Icommon\ -Idelta\ -Ilz\ -Ilzma\ -Irangecoder\ -Isimple\ -Wno-implicit-function-declaration -DHAVE__BOOL %LIBLZMA%
move /Y *.o ..\..\ > nul
popd
:nocontrib
echo Building precomp...
%GPP% %DCOMFORT% %MPARAM% -static -static-libgcc -static-libstdc++ -DMINGW %DBIT% -lpthread -Wall precomp.cpp %JPG_O% %MP3_O% %GIF_O% %BZIP_O% %ZLIB_O% %LIBLZMA_CPP% %LIBLZMA_O% -O2 -fomit-frame-pointer -s -o%EXE1%%EXE2%.exe
%GPP% %DCOMFORT% %MPARAM% -std=c++11 -static -static-libgcc -static-libstdc++ -DMINGW %DBIT% -lpthread -Wall precomp.cpp %JPG_O% %MP3_O% %GIF_O% %BZIP_O% %ZLIB_O% %LIBLZMA_CPP% %LIBLZMA_O% -O2 -fomit-frame-pointer -s -o%EXE1%%EXE2%.exe
if not %ERRORLEVEL% == 0 echo ERROR!!!
if %ERRORLEVEL% == 0 echo.
if %ERRORLEVEL% == 0 echo Build successful.