From 64a50242d70179871834cfb8174c193766da4b37 Mon Sep 17 00:00:00 2001 From: Christian Schneider Date: Mon, 2 Jan 2017 10:00:47 +0100 Subject: [PATCH] Compile 64 bit versions by default --- Makefile | 2 +- contrib/bzip2/Makefile | 2 +- contrib/giflib/Makefile | 2 +- contrib/liblzma/Makefile | 2 +- contrib/packjpg/Makefile | 2 +- contrib/packmp3/Makefile | 2 +- contrib/zlib/Makefile | 2 +- make.bat | 28 ++++++++++++++-------------- 8 files changed, 21 insertions(+), 21 deletions(-) diff --git a/Makefile b/Makefile index efc9ada..8e9d209 100644 --- a/Makefile +++ b/Makefile @@ -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 = -std=c++11 -DUNIX -D_FILE_OFFSET_BITS=64 -O2 -Wall -pthread +CFLAGS = -std=c++11 -DUNIX -D_FILE_OFFSET_BITS=64 -m64 -O2 -Wall -pthread .PHONY: all all: contrib $(PROGNAME) diff --git a/contrib/bzip2/Makefile b/contrib/bzip2/Makefile index 2784279..7d3ca28 100644 --- a/contrib/bzip2/Makefile +++ b/contrib/bzip2/Makefile @@ -1,5 +1,5 @@ OBJECTS = bzlib.o blocksort.o crctable.o compress.o decompress.o huffman.o randtable.o -CFLAGS = -DLINUX -D_FILE_OFFSET_BITS=64 -O2 -Wall +CFLAGS = -DLINUX -D_FILE_OFFSET_BITS=64 -m64 -O2 -Wall .PHONY: all all: $(OBJECTS) diff --git a/contrib/giflib/Makefile b/contrib/giflib/Makefile index 6b2c98e..51ec0ac 100644 --- a/contrib/giflib/Makefile +++ b/contrib/giflib/Makefile @@ -1,5 +1,5 @@ OBJECTS = gifalloc.o gif_err.o dgif_lib_gcc.o egif_lib_gcc.o -CFLAGS = -DLINUX -D_FILE_OFFSET_BITS=64 -O2 -Wall +CFLAGS = -DLINUX -D_FILE_OFFSET_BITS=64 -m64 -O2 -Wall .PHONY: all all: $(OBJECTS) diff --git a/contrib/liblzma/Makefile b/contrib/liblzma/Makefile index 32958ed..465d4ed 100644 --- a/contrib/liblzma/Makefile +++ b/contrib/liblzma/Makefile @@ -1,4 +1,4 @@ -CFLAGS = -g -c -std=c99 -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 -m64 -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 diff --git a/contrib/packjpg/Makefile b/contrib/packjpg/Makefile index cb06e69..6debe79 100644 --- a/contrib/packjpg/Makefile +++ b/contrib/packjpg/Makefile @@ -1,5 +1,5 @@ OBJECTS = bitops.o aricoder.o packjpg.o -CFLAGS = -O3 -DUNIX -DBUILD_LIB -Wall -pedantic -funroll-loops -ffast-math -fomit-frame-pointer +CFLAGS = -m64 -O3 -DUNIX -DBUILD_LIB -Wall -pedantic -funroll-loops -ffast-math -fomit-frame-pointer .PHONY: all all: $(OBJECTS) diff --git a/contrib/packmp3/Makefile b/contrib/packmp3/Makefile index 324e453..86b03f5 100644 --- a/contrib/packmp3/Makefile +++ b/contrib/packmp3/Makefile @@ -1,5 +1,5 @@ OBJECTS = huffmp3.o packmp3.o -CFLAGS = -O3 -DUNIX -DBUILD_LIB -Wall -pedantic -funroll-loops -ffast-math -fomit-frame-pointer +CFLAGS = -m64 -O3 -DUNIX -DBUILD_LIB -Wall -pedantic -funroll-loops -ffast-math -fomit-frame-pointer .PHONY: all all: $(OBJECTS) diff --git a/contrib/zlib/Makefile b/contrib/zlib/Makefile index 471af0f..9f21b51 100644 --- a/contrib/zlib/Makefile +++ b/contrib/zlib/Makefile @@ -1,5 +1,5 @@ OBJECTS = adler32.o crc32.o zutil.o trees.o inftrees.o inffast.o inflate.o deflate.o -CFLAGS = -DLINUX -D_FILE_OFFSET_BITS=64 -O2 -Wall +CFLAGS = -m64 -DLINUX -D_FILE_OFFSET_BITS=64 -O2 -Wall .PHONY: all all: $(OBJECTS) diff --git a/make.bat b/make.bat index f23bd09..2db761a 100644 --- a/make.bat +++ b/make.bat @@ -1,10 +1,10 @@ @echo off REM Usage: -REM "make" for a 32-bit compile of Precomp -REM "make 64" for a 64-bit compile of Precomp -REM "make comfort" for a 32-bit compile of Precomp Comfort -REM "make comfort 64" or "make 64 comfort" for a 64-bit compile of Precomp Comfort +REM "make" for a 64-bit compile of Precomp +REM "make 32" for a 32-bit compile of Precomp +REM "make comfort" for a 64-bit compile of Precomp Comfort +REM "make comfort 32" or "make 32 comfort" for a 64-bit compile of Precomp Comfort REM "nocontrib" parameter to build only Precomp, can be used for a much faster build REM if nothing was changed in the "contrib" folder @@ -17,19 +17,19 @@ set GPP64=x86_64-w64-mingw32-g++ set EXE1=precomp set EXE2= set DCOMFORT= -set DBIT= -set MPARAM=-march=pentiumpro -set GCC=%GCC32% -set GPP=%GPP32% +set DBIT=-DBIT64 +set MPARAM=-march=x86-64 -m64 +set GCC=%GCC64% +set GPP=%GPP64% set NOCONTRIB= :parse if "%1%"=="" goto endparse -if "%1%"=="64" ( - set GCC=%GCC64% - set GPP=%GPP64% - set EXE2=64 - set DBIT=-DBIT64 - set MPARAM=-march=x86-64 -m64 +if "%1%"=="32" ( + set GCC=%GCC32% + set GPP=%GPP32% + set MPARAM=-march=pentiumpro + set EXE2=32 + set DBIT= ) if "%1%"=="comfort" ( set EXE1=precomf