Merge pull request #132 from Hello71/no_override_cflags

use __linux/__unix instead of CMAKE_C(XX)_FLAGS

Author: schnaader

CMakeLists.txt

@@ -17,9 +17,7 @@ else()
 endif()
 
 if (UNIX)
- set(CMAKE_C_FLAGS "-DLINUX -DUNIX -DHAVE_STDBOOL_H")
  set(CMAKE_C_STANDARD 99)
- set(CMAKE_CXX_FLAGS "-DUNIX")
  set(CMAKE_CXX_STANDARD 11)
  set(THREADS_PREFER_PTHREAD_FLAG ON)
  find_package(Threads REQUIRED)

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 -m64 -O2 -Wall
+CFLAGS = -D_FILE_OFFSET_BITS=64 -m64 -O2 -Wall
 
 .PHONY: all
 all: $(OBJECTS)

contrib/bzip2/Makefile.32

@@ -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 = -D_FILE_OFFSET_BITS=64 -O2 -Wall
 
 .PHONY: all
 all: $(OBJECTS)

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 -m64 -O2 -Wall
+CFLAGS = -D_FILE_OFFSET_BITS=64 -m64 -O2 -Wall
 
 .PHONY: all
 all: $(OBJECTS)

contrib/giflib/Makefile.32

@@ -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 = -D_FILE_OFFSET_BITS=64 -O2 -Wall
 
 .PHONY: all
 all: $(OBJECTS)

contrib/giflib/dgif_lib_gcc.c

@@ -31,7 +31,7 @@
 #ifdef HAVE_FCNTL_H
 #include <fcntl.h>
 #endif /* HAVE_FCNTL_H */
-#ifndef LINUX
+#ifndef __linux
  #ifdef HAVE_UNISTD_H
  #include <unistd.h>
  #endif /* HAVE_UNISTD_H */
@@ -184,7 +184,7 @@ DGifOpenFileName(const char *FileName) {
  int FileHandle;
  GifFileType *GifFile;
 
- #ifndef LINUX
+ #ifndef __linux
  if ((FileHandle = open(FileName, O_RDONLY | O_BINARY)) == -1) {
  #else
  // TODO: Does this work?
@@ -1150,4 +1150,4 @@ DGifBufferedInput(GifFileType * GifFile,
  }
 
  return GIF_OK;
-}
+}

contrib/giflib/egif_lib_gcc.c

@@ -46,7 +46,7 @@
 #ifdef HAVE_FCNTL_H
 #include <fcntl.h>
 #endif /* HAVE_FCNTL_H */
-#ifndef LINUX
+#ifndef __linux
  #ifdef HAVE_UNISTD_H
  #include <unistd.h>
  #endif /* HAVE_UNISTD_H */
@@ -107,15 +107,15 @@ EGifOpenFileName(const char *FileName,
  GifFileType *GifFile;
 
  if (TestExistance)
- #ifndef LINUX
+ #ifndef __linux
  FileHandle = open(FileName, O_WRONLY | O_CREAT | O_EXCL | O_BINARY
  #else
  // TODO: Does this work?
  FileHandle = open(FileName, O_WRONLY | O_CREAT | O_EXCL
  #endif
  , S_IREAD | S_IWRITE);
  else
- #ifndef LINUX
+ #ifndef __linux
  FileHandle = open(FileName, O_WRONLY | O_CREAT | O_TRUNC | O_BINARY 
  #else
  // TODO: Does this work?
@@ -167,7 +167,7 @@ EGifOpenFileHandle(int FileHandle) {
  return NULL;
  }
 
- #ifndef LINUX
+ #ifndef __linux
  setmode(FileHandle, O_BINARY); /* Make sure it is in binary mode. */
  #endif
 

contrib/liblzma/Makefile

@@ -1,4 +1,4 @@
-CFLAGS = -g -c -std=gnu99 -DHAVE__BOOL -DUNIX -D_FILE_OFFSET_BITS=64 -m64 -O2 -Wno-implicit-function-declaration -pthread
+CFLAGS = -g -c -std=gnu99 -DHAVE__BOOL -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
 

contrib/liblzma/Makefile.32

@@ -1,4 +1,4 @@
-CFLAGS = -g -c -std=gnu99 -DHAVE__BOOL -DUNIX -D_FILE_OFFSET_BITS=64 -O2 -Wno-implicit-function-declaration -pthread
+CFLAGS = -g -c -std=gnu99 -DHAVE__BOOL -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
 

contrib/liblzma/common/sysdefs_schnaader.h

@@ -4,11 +4,9 @@
 
 #include <inttypes.h>
 
-#ifdef _MSC_VER
 #define HAVE_STDBOOL_H
-#endif
 
-#ifdef UNIX
+#ifdef __unix
  #include <string.h>
  #define MYTHREAD_POSIX
 #else