Merge pull request #38 from enpinion/master

MinGW compilation fixes
gopro · Jan 9, 2020 · 7bfce84 · 7bfce84
2 parents bf1b09f + 62c64fe
commit 7bfce84
Show file tree

Hide file tree

Showing 86 changed files with 354 additions and 335 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -13,20 +13,25 @@ add_definitions(-D_ALLOCATOR=1 -DWARPSTUFF=1)
 
 if (WIN32)
 	SET(COMPILER_FLAGS "")
-	SET(COMPILER_FLAGS_W_OMP "/openmp" )
-	SET(ADDITIONAL_LIBS "")
+	if (MSVC)
+		SET(COMPILER_FLAGS_W_OMP "/openmp")
+		SET(ADDITIONAL_LIBS "")
+	else()
+		SET(COMPILER_FLAGS_W_OMP -fopenmp)
+		SET(ADDITIONAL_LIBS "-lgomp")
+	endif()
 endif (WIN32)
 
 if (UNIX)
-	SET(COMPILER_FLAGS -fPIC -O3)
-	SET(COMPILER_FLAGS_W_OMP -fopenmp -O3)
+	SET(COMPILER_FLAGS -fPIC)
+	SET(COMPILER_FLAGS_W_OMP -fopenmp)
 	SET(ADDITIONAL_LIBS "-luuid -lpthread -lgomp")
 	SET(TOY_LIBS "-lm")
 endif (UNIX)
 
 if (APPLE)
-	SET(COMPILER_FLAGS -fvisibility=hidden -O3)
-	SET(COMPILER_FLAGS_W_OMP -O3)
+	SET(COMPILER_FLAGS -fvisibility=hidden)
+	SET(COMPILER_FLAGS_W_OMP)
 	SET(ADDITIONAL_LIBS "-lpthread")
 endif (APPLE)
 

diff --git a/Codec/DemoasicFrames.cpp b/Codec/DemoasicFrames.cpp
@@ -28,7 +28,7 @@
 #include <assert.h>
 #include <emmintrin.h>		// SSE2 intrinsics
 
-#ifdef _WINDOWS
+#ifdef _WIN32
 #include <windows.h>
 //#include <atlbase.h> // Required for VS2005 but not 2003
 #elif __APPLE__
@@ -4969,7 +4969,7 @@ void BayerRippleFilter(	int width,
 }
 
 
-#ifdef _WINDOWS
+#ifdef _WIN32
 
 static int
 WINAPI
@@ -5097,7 +5097,7 @@ float *LoadCube64_3DLUT(DECODER *decoder, CFHDDATA *cfhddata, int *lutsize)
 		if(decoder->LUTsPathStr[0] == 0)
 			InitLUTPaths(decoder);
 
-#ifdef _WINDOWS
+#ifdef _WIN32
 		sprintf_s(crcname, sizeof(crcname), "%s/%08X.cflook", decoder->LUTsPathStr, (uint32_t)cfhddata->user_look_CRC);
 		err = fopen_s(&fp, crcname, "rb");
 #else
@@ -5111,7 +5111,7 @@ float *LoadCube64_3DLUT(DECODER *decoder, CFHDDATA *cfhddata, int *lutsize)
 			int validcflook = 0;
 			int len = 0;
 
-#ifdef _WINDOWS
+#ifdef _MSC_VER
 			len = (int)fread_s(&CFLKhdr, sizeof(CFLook_Header), 1, sizeof(CFLook_Header), fp);
 #else
 			len = (int)fread(&CFLKhdr, 1, sizeof(CFLook_Header), fp);
@@ -5351,7 +5351,7 @@ void UpdateCFHDDATA(DECODER *decoder, unsigned char *ptr, int len, int delta, in
 			size = ptr[4] + (ptr[5]<<8) + (ptr[6]<<16);
 			tag = MAKETAG(ptr[0],ptr[1],ptr[2],ptr[3]);
 
-#if _WINDOWS && _DEBUG && 0
+#if _WIN32 && _DEBUG && 0
 			if(type == 'f')
 			{
 				char t[1000],tt[100];
@@ -5664,7 +5664,7 @@ void UpdateCFHDDATA(DECODER *decoder, unsigned char *ptr, int len, int delta, in
 				break;
 
 			case TAG_TIMECODE:
-#ifdef _WINDOWS
+#ifdef _WIN32
 				strncpy_s(cfhddata->FileTimecodeData.orgtime, sizeof(cfhddata->FileTimecodeData.orgtime),(char *)data, 15);
 #else				
 				strncpy(cfhddata->FileTimecodeData.orgtime, (char *)data, 15);
@@ -5725,7 +5725,7 @@ void UpdateCFHDDATA(DECODER *decoder, unsigned char *ptr, int len, int delta, in
 					{
 						int copysize = (int)size;
 						if(copysize > 39) copysize = 39;
-#ifdef _WINDOWS
+#ifdef _WIN32
 						strncpy_s(cfhddata->look_filename, sizeof(cfhddata->look_filename), (char *)data, copysize);
 #else
 						strncpy(cfhddata->look_filename, (char *)data, copysize);
@@ -5738,7 +5738,7 @@ void UpdateCFHDDATA(DECODER *decoder, unsigned char *ptr, int len, int delta, in
 					{
 						if(0 != strncmp(cfhddata->look_export_path, (char *)data, size))
 						{
-#ifdef _WINDOWS
+#ifdef _WIN32
 							strncpy_s(cfhddata->look_export_path, sizeof(cfhddata->look_export_path), (char *)data, size);
 #else
 							strncpy(cfhddata->look_export_path, (char *)data, size);
@@ -6436,7 +6436,7 @@ void UpdateCFHDDATA(DECODER *decoder, unsigned char *ptr, int len, int delta, in
 				case TAG_DISPLAY_FREEFORM:
 					copysize = size;
 					if(copysize >= FREEFORM_STR_MAXSIZE) copysize = FREEFORM_STR_MAXSIZE-1;
-#ifdef _WINDOWS
+#ifdef _WIN32
 					strncpy_s(decoder->MDPdefault.freeform, sizeof(decoder->MDPdefault.freeform), (char *)data, copysize);
 #else
 					strncpy(decoder->MDPdefault.freeform, (char *)data, copysize);
@@ -6448,7 +6448,7 @@ void UpdateCFHDDATA(DECODER *decoder, unsigned char *ptr, int len, int delta, in
 					copysize = size;
 					if(copysize >= FONTNAME_STR_MAXSIZE) copysize = FONTNAME_STR_MAXSIZE-1;
 
-#ifdef _WINDOWS
+#ifdef _WIN32
 					strncpy_s(decoder->MDPdefault.font, sizeof(decoder->MDPdefault.font), (char *)data, copysize);
 #else
 					strncpy(decoder->MDPdefault.font, (char *)data, copysize);
@@ -6485,7 +6485,7 @@ void UpdateCFHDDATA(DECODER *decoder, unsigned char *ptr, int len, int delta, in
 				case TAG_DISPLAY_FORMAT:
 					copysize = size;
 					if(copysize >= FORMAT_STR_MAXSIZE) copysize = FORMAT_STR_MAXSIZE-1;
-#ifdef _WINDOWS
+#ifdef _WIN32
 					strncpy_s(decoder->MDPdefault.format_str, sizeof(decoder->MDPdefault.format_str), (char *)data, copysize);
 #else
 					strncpy(decoder->MDPdefault.format_str, (char *)data, copysize);
@@ -6495,7 +6495,7 @@ void UpdateCFHDDATA(DECODER *decoder, unsigned char *ptr, int len, int delta, in
 				case TAG_DISPLAY_PNG_PATH:
 					copysize = size;
 					if(copysize >= PNG_PATH_MAXSIZE) copysize = PNG_PATH_MAXSIZE-1;
-#ifdef _WINDOWS
+#ifdef _WIN32
 					strncpy_s(decoder->MDPdefault.png_path, sizeof(decoder->MDPdefault.png_path), (char *)data, copysize);
 #else
 					strncpy(decoder->MDPdefault.png_path, (char *)data, copysize);
@@ -6654,7 +6654,7 @@ void GetCurrentID(DECODER *decoder, unsigned char *ptr, unsigned int len, char *
 				break;
 			case TAG_DISPLAY_FREEFORM:
 				if(size > id_size-1) size = id_size-1;
-#ifdef _WINDOWS
+#ifdef _WIN32
 				strncpy_s(id, id_size,(char *)data, size);
 #else
 				strncpy(id, (char *)data, size);

diff --git a/Codec/RGB2YUV.c b/Codec/RGB2YUV.c
@@ -57,7 +57,7 @@ const int tweakYUV2RGB_CG601[8] =	{-28,14,6,1,7,3,23,23};
 const int tweakYUV2RGB_VS601[8] =	{-26,12,9,-8,1,-6,15,14};
 #endif
 
-#ifdef _WINDOWS
+#ifdef _WIN32
 #include <windows.h>
 #endif
 
@@ -73,7 +73,7 @@ void LoadTweak()
 	sscanf(txt,"%d,%d,%d,%d,%d,%d,%d,%d,%d",&tweak[0],&tweak[1],&tweak[2],&tweak[3],&tweak[4],&tweak[5],&tweak[6],&tweak[7],&tweak[8]);
 
 	txt[len] = 0;
-#ifdef _WINDOWS
+#ifdef _WIN32
 	OutputDebugString(txt);
 #endif
 }
@@ -573,7 +573,7 @@ void ChunkyARGB8toPlanarRGB16(unsigned char *in_rgb8, unsigned short *out_rgb16,
 			gggggggg = _mm_slli_epi16(gggggggg, 8);
 			bbbbbbbb = _mm_slli_epi16(bbbbbbbb, 8);
 
-//#ifdef _WINDOWS // is QT32 mode different on the PC?
+//#ifdef _WIN32 // is QT32 mode different on the PC?
 			_mm_storeu_si128((__m128i *)&out_rgb16[x], bbbbbbbb);
 			_mm_storeu_si128((__m128i *)&out_rgb16[x+width], gggggggg);
 			_mm_storeu_si128((__m128i *)&out_rgb16[x+width*2], rrrrrrrr);
@@ -619,7 +619,7 @@ void ChunkyARGB8toPlanarRGB16(unsigned char *in_rgb8, unsigned short *out_rgb16,
 			gggggggg = _mm_slli_epi16(gggggggg, 8);
 			bbbbbbbb = _mm_slli_epi16(bbbbbbbb, 8);
 
-//#ifdef _WINDOWS // is QT32 mode different on the PC?
+//#ifdef _WIN32 // is QT32 mode different on the PC?
 			_mm_store_si128((__m128i *)&out_rgb16[x], bbbbbbbb);
 			_mm_store_si128((__m128i *)&out_rgb16[x+width], gggggggg);
 			_mm_store_si128((__m128i *)&out_rgb16[x+width*2], rrrrrrrr);

diff --git a/Codec/allocator.h b/Codec/allocator.h
@@ -31,12 +31,16 @@
 #include "../Common/CFHDAllocator.h"
 
 
-#ifdef _WINDOWS
+#ifdef _WIN32
 
 #ifdef INLINE
 #undef INLINE
 #endif
+#ifdef _MSC_VER
 #define INLINE __forceinline
+#else
+#define INLINE inline
+#endif
 
 #elif defined(__APPLE__)
 

diff --git a/Codec/bandfile.c b/Codec/bandfile.c
@@ -136,7 +136,7 @@ struct bandfile_band_header
 CODEC_ERROR OpenBandFile(BANDFILE *bandfile, const char *pathname)
 {
 	memset(bandfile, 0, sizeof(BANDFILE));
-#ifdef _WINDOWS
+#ifdef _WIN32
 	fopen_s(&bandfile->file, pathname, "rb");
 #else
 	bandfile->file = fopen(pathname, "rb");
@@ -326,7 +326,7 @@ CODEC_ERROR ReadBandData(BANDFILE *bandfile, void *data, size_t size)
 CODEC_ERROR CreateBandFile(BANDFILE *bandfile, const char *pathname)
 {
 	memset(bandfile, 0, sizeof(BANDFILE));
-#ifdef _WINDOWS
+#ifdef _WIN32
 	fopen_s(&bandfile->file, pathname, "rb");
 #else
 	bandfile->file = fopen(pathname, "wb");

diff --git a/Codec/bayer.c b/Codec/bayer.c
@@ -6714,7 +6714,7 @@ void ComputeCube(DECODER *decoder)
 
 				cfhddata->export_look = 0;
 
-#ifdef _WINDOWS
+#ifdef _WIN32
 				err = fopen_s(&fp, cfhddata->look_export_path, "w");
 #else
 				fp = fopen(cfhddata->look_export_path, "w");
@@ -6768,7 +6768,7 @@ void ComputeCube(DECODER *decoder)
 						int err = 0;
 
 
-#ifdef _WINDOWS
+#ifdef _WIN32
 						strcpy_s(cubename, sizeof(cubename), cfhddata->look_export_path);
 						cubename[strlen(cubename) - 4] = 0;
 						strcat_s(cubename, sizeof(cubename), "cube");
@@ -6778,7 +6778,7 @@ void ComputeCube(DECODER *decoder)
 						cubename[strlen(cubename) - 4] = 0;
 #endif
 
-#ifdef _WINDOWS
+#ifdef _WIN32
 						err = fopen_s(&fp, cubename, "w");
 #else
 						fp = fopen(cubename, "w");
@@ -6789,7 +6789,7 @@ void ComputeCube(DECODER *decoder)
 							char fname[260] = "CubeExport";
 							//short *pLUT = (short *)RawCube;
 
-#ifdef _WINDOWS
+#ifdef _WIN32
 							//_splitpath(cubename, NULL, NULL, fname, NULL);
 							_splitpath_s(cubename, NULL, 0, NULL, 0, fname, sizeof(fname), NULL, 0);
 #endif
@@ -7418,7 +7418,7 @@ void ComputeCube(DECODER *decoder)
 
 #endif
 
-#ifdef _WINDOWS
+#ifdef _WIN32
 #pragma warning(disable: 4554)
 #endif
 
@@ -13666,7 +13666,7 @@ THREAD_PROC(WorkerThreadProc, lpParam)
 	//int initFsm = -1;
 	//FSM fsm;
 
-#ifdef _WINDOWS
+#ifdef _WIN32
 	if(decoder->thread_cntrl.affinity)
 	{
 		HANDLE hCurrentThread = GetCurrentThread();

diff --git a/Codec/bitstream.c b/Codec/bitstream.c
@@ -215,7 +215,7 @@ uint8_t  *GetBitstreamPosition(BITSTREAM *stream)
 // Set the current position of the pointer into the block
 void SetBitstreamPosition(BITSTREAM *stream, uint8_t  *position)
 {
-#ifdef _WINDOWS
+#ifdef _WIN32
 	LONGLONG skip = ((LONGLONG)position) - ((LONGLONG)stream->lpCurrentWord);
 #else
 	int64_t skip = ((int64_t)position) - ((int64_t)stream->lpCurrentWord);
@@ -240,7 +240,7 @@ uint8_t  GetWord(BITSTREAM *stream)
 		if (stream->file != BITSTREAM_FILE_INVALID &&
 			stream->access == BITSTREAM_ACCESS_READ)
 		{
-#ifdef _WINDOWS
+#ifdef _WIN32
 			// Read a block from the file
 			BOOL bReadOkay = ReadFile(stream->file, stream->block, stream->dwBlockLength, &stream->nWordsUsed, NULL);
 
@@ -772,7 +772,7 @@ void PutWord(BITSTREAM *stream, uint8_t  word)
 		{
 			DWORD dwByteCount = stream->nWordsUsed * sizeof(uint8_t );
 			DWORD dwBytesWritten;
-#ifdef _WINDOWS
+#ifdef _WIN32
 			// Write the block to the output file
 			bool bWriteOkay = WriteFile(stream->file, stream->block, dwByteCount, &dwBytesWritten, NULL);
 
@@ -1861,7 +1861,7 @@ void CloseBitstream(BITSTREAM *stream)
 		{
 			DWORD nBytesToWrite = stream->nWordsUsed * sizeof(uint8_t );
 			DWORD nBytesWritten;
-#ifdef _WINDOWS
+#ifdef _WIN32
 			// Write the block to the output file
 			WriteFile(stream->file, stream->block, nBytesToWrite, &nBytesWritten, NULL);
 			assert(nBytesToWrite == nBytesWritten);
@@ -1921,7 +1921,7 @@ void DetachBitstreamFile(BITSTREAM *stream)
 		{
 			DWORD nBytesToWrite = stream->nWordsUsed * sizeof(uint8_t );
 			DWORD nBytesWritten;
-#ifdef _WINDOWS
+#ifdef _WIN32
 			// Write the block to the output file
 			WriteFile(stream->file, stream->block, nBytesToWrite, &nBytesWritten, NULL);
 			assert(nBytesToWrite == nBytesWritten);

diff --git a/Codec/bitstream.h b/Codec/bitstream.h
@@ -26,7 +26,7 @@
 #undef _POSIX
 #endif
 
-#ifdef _WINDOWS
+#ifdef _WIN32
 #include <windows.h>
 #else
 // Force the use of POSIX on Macintosh and Linux

diff --git a/Codec/codec.c b/Codec/codec.c
@@ -33,7 +33,7 @@
 
 #include <emmintrin.h>
 
-#if (DEBUG && _WINDOWS)
+#if (DEBUG && _WIN32)
 #include <tchar.h>		// For printing debug string in the console window
 #endif
 

diff --git a/Codec/config.h b/Codec/config.h
@@ -29,7 +29,7 @@
 #define _GRAPHICS	0
 #endif
 
-#ifdef _WINDOWS
+#ifdef _WIN32
  #ifndef DEBUG_ALLOCS
  #define DEBUG_ALLOCS	1
  #endif
@@ -86,7 +86,7 @@
 #include <stdbool.h>
 
 // Use the standard definition for the maximum length of a pathname
-#ifdef _WINDOWS
+#ifdef _WIN32
 #ifndef PATH_MAX
 #define PATH_MAX _MAX_PATH
 #endif
@@ -267,7 +267,7 @@ static void *malloc22(size_t size, size_t align)
 #define _DELAYED_THREAD_START	1
 
 #ifndef _INTERLACED_WORKER_THREADS
-#ifdef _WINDOWS
+#ifdef _WIN32
 #define _INTERLACED_WORKER_THREADS (_THREADED_DECODER)		// Use worker threads for the last transform?
 #else
 #define _INTERLACED_WORKER_THREADS 0

diff --git a/Codec/convert.c b/Codec/convert.c
@@ -78,7 +78,7 @@ int Timecode2frames(char *tc, int rate)
 
 	if (tc)
 	{
-#ifdef _WINDOWS
+#ifdef _WIN32
 		ret = sscanf_s(tc, "%02d:%02d:%02d:%02d", &hr, &mn, &sc, &fr);
 #else
 		ret = sscanf(tc, "%02d:%02d:%02d:%02d", &hr, &mn, &sc, &fr);

diff --git a/Codec/cpuid.c b/Codec/cpuid.c
@@ -21,7 +21,7 @@
 
 // Adapted from Microsoft Visual Studio .NET sample code
 
-#ifdef _WINDOWS
+#ifdef _WIN32
 #include <windows.h>
 #elif __APPLE__
 #include "macdefs.h"
@@ -40,7 +40,7 @@
 // This bit is set when cpuid is called with register set to 80000001h (only applicable to AMD)
 #define _3DNOW_FEATURE_BIT      0x80000000
 
-#ifdef _WINDOWS
+#ifdef _WIN32
 
 int GetProcessorCount()
 {