From 6fcd5b92d79e4db2c8e47fcfe7a410145f033a68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20St=C3=B6ggl?= Date: Thu, 18 Jun 2020 10:01:42 +0200 Subject: [PATCH] Fix further issues on case sensitive file systems Further issues when building CUETools on a case sensitive filesystem or folder were found in CUETools.Codecs.TTA and ttalib-1.1 - Remove precompiled headers from: CUETools.Codecs.TTA.vcxproj TTALib.vcxproj This fixes case sensitivity issues coming from different spellings of stdafx (stdafx.cpp, Stdafx.cpp; stdafx.h, Stdafx.h). The stdafx.h header files were empty in both cases, so remove precompiled headers completely. Remark: The file TTALib.vcproj was unused and therefore removed. TTALib.vcxproj is used by CUETools and gets updated. - Use lowercase ttalib-1.1 for includes in CUETools.Codecs.TTA.cpp, because the name of the sub-directory, which contains the TTALib files is lowercase: TTALib-1.1->ttalib-1.1 - Fix lower/uppercase spelling of included headers in files of ttalib-1.1 according to the spelling of the filenames: bitreader.h->BitReader.h ttareader.h->TTAReader.h ttawriter.h->TTAWriter.h Rename the file ttacommon.h for conformity and update the includes: ttacommon.h->TTACommon.h - Summary of changes to files (rename, delete): deleted: CUETools.Codecs.TTA/Stdafx.cpp deleted: CUETools.Codecs.TTA/Stdafx.h deleted: ttalib-1.1/Stdafx.cpp deleted: ttalib-1.1/Stdafx.h renamed: ttalib-1.1/ttacommon.h -> ttalib-1.1/TTACommon.h deleted: ttalib-1.1/TTALib.vcproj --- CUETools.Codecs.TTA/AssemblyInfo.cpp | 2 - CUETools.Codecs.TTA/CUETools.Codecs.TTA.cpp | 8 +- .../CUETools.Codecs.TTA.vcxproj | 11 - CUETools.Codecs.TTA/Stdafx.cpp | 5 - CUETools.Codecs.TTA/Stdafx.h | 7 - ttalib-1.1/Stdafx.cpp | 5 - ttalib-1.1/Stdafx.h | 8 - ttalib-1.1/{ttacommon.h => TTACommon.h} | 0 ttalib-1.1/TTALib.cpp | 7 +- ttalib-1.1/TTALib.vcproj | 416 ------------------ ttalib-1.1/TTALib.vcxproj | 13 +- ttalib-1.1/TTAReader.cpp | 1 - ttalib-1.1/TTAReader.h | 2 +- ttalib-1.1/TTATester.h | 2 +- ttalib-1.1/TTAWriter.cpp | 1 - ttalib-1.1/WavFile.cpp | 1 - 16 files changed, 9 insertions(+), 480 deletions(-) delete mode 100644 CUETools.Codecs.TTA/Stdafx.cpp delete mode 100644 CUETools.Codecs.TTA/Stdafx.h delete mode 100644 ttalib-1.1/Stdafx.cpp delete mode 100644 ttalib-1.1/Stdafx.h rename ttalib-1.1/{ttacommon.h => TTACommon.h} (100%) delete mode 100644 ttalib-1.1/TTALib.vcproj diff --git a/CUETools.Codecs.TTA/AssemblyInfo.cpp b/CUETools.Codecs.TTA/AssemblyInfo.cpp index 8451d72..643cd67 100644 --- a/CUETools.Codecs.TTA/AssemblyInfo.cpp +++ b/CUETools.Codecs.TTA/AssemblyInfo.cpp @@ -1,5 +1,3 @@ -#include "stdafx.h" - using namespace System; using namespace System::Reflection; using namespace System::Runtime::CompilerServices; diff --git a/CUETools.Codecs.TTA/CUETools.Codecs.TTA.cpp b/CUETools.Codecs.TTA/CUETools.Codecs.TTA.cpp index 25e2f62..f3d7a6c 100644 --- a/CUETools.Codecs.TTA/CUETools.Codecs.TTA.cpp +++ b/CUETools.Codecs.TTA/CUETools.Codecs.TTA.cpp @@ -1,14 +1,12 @@ // This is the main DLL file. -#include "stdafx.h" - #include "CUETools.Codecs.TTA.h" typedef void * HANDLE; -#include "../TTALib-1.1/TTAReader.h" -#include "../TTALib-1.1/TTAWriter.h" -#include "../TTALib-1.1/TTAError.h" +#include "../ttalib-1.1/TTAReader.h" +#include "../ttalib-1.1/TTAWriter.h" +#include "../ttalib-1.1/TTAError.h" namespace CUETools { namespace Codecs { diff --git a/CUETools.Codecs.TTA/CUETools.Codecs.TTA.vcxproj b/CUETools.Codecs.TTA/CUETools.Codecs.TTA.vcxproj index e23a385..4aa1db7 100644 --- a/CUETools.Codecs.TTA/CUETools.Codecs.TTA.vcxproj +++ b/CUETools.Codecs.TTA/CUETools.Codecs.TTA.vcxproj @@ -100,7 +100,6 @@ Disabled WIN32;_DEBUG;%(PreprocessorDefinitions) MultiThreadedDebugDLL - Use Level3 ProgramDatabase @@ -123,7 +122,6 @@ Disabled WIN32;_DEBUG;%(PreprocessorDefinitions) MultiThreadedDebugDLL - Use Level3 ProgramDatabase @@ -142,7 +140,6 @@ WIN32;NDEBUG;%(PreprocessorDefinitions) MultiThreadedDLL - Use Level3 ProgramDatabase @@ -163,7 +160,6 @@ WIN32;NDEBUG;%(PreprocessorDefinitions) MultiThreadedDLL - Use Level3 ProgramDatabase @@ -212,17 +208,10 @@ - - Create - Create - Create - Create - - diff --git a/CUETools.Codecs.TTA/Stdafx.cpp b/CUETools.Codecs.TTA/Stdafx.cpp deleted file mode 100644 index 44a182d..0000000 --- a/CUETools.Codecs.TTA/Stdafx.cpp +++ /dev/null @@ -1,5 +0,0 @@ -// stdafx.cpp : source file that includes just the standard includes -// CUETools.Codecs.TTA.pch will be the pre-compiled header -// stdafx.obj will contain the pre-compiled type information - -#include "stdafx.h" diff --git a/CUETools.Codecs.TTA/Stdafx.h b/CUETools.Codecs.TTA/Stdafx.h deleted file mode 100644 index 2e525d4..0000000 --- a/CUETools.Codecs.TTA/Stdafx.h +++ /dev/null @@ -1,7 +0,0 @@ -// stdafx.h : include file for standard system include files, -// or project specific include files that are used frequently, -// but are changed infrequently - -#pragma once - - diff --git a/ttalib-1.1/Stdafx.cpp b/ttalib-1.1/Stdafx.cpp deleted file mode 100644 index 3220eb3..0000000 --- a/ttalib-1.1/Stdafx.cpp +++ /dev/null @@ -1,5 +0,0 @@ -// stdafx.cpp : source file that includes just the standard includes -// TTALib.pch will be the pre-compiled header -// stdafx.obj will contain the pre-compiled type information - -#include "stdafx.h" diff --git a/ttalib-1.1/Stdafx.h b/ttalib-1.1/Stdafx.h deleted file mode 100644 index a1e5342..0000000 --- a/ttalib-1.1/Stdafx.h +++ /dev/null @@ -1,8 +0,0 @@ -// stdafx.h : include file for standard system include files, -// or project specific include files that are used frequently, -// but are changed infrequently - -#pragma once - -//#using - diff --git a/ttalib-1.1/ttacommon.h b/ttalib-1.1/TTACommon.h similarity index 100% rename from ttalib-1.1/ttacommon.h rename to ttalib-1.1/TTACommon.h diff --git a/ttalib-1.1/TTALib.cpp b/ttalib-1.1/TTALib.cpp index b4aebe7..ffe2721 100644 --- a/ttalib-1.1/TTALib.cpp +++ b/ttalib-1.1/TTALib.cpp @@ -27,14 +27,13 @@ * information. */ -#include "stdafx.h" #include #include "TTALib.h" -#include "ttacommon.h" +#include "TTACommon.h" #include "filters3.h" -#include "ttawriter.h" -#include "ttareader.h" +#include "TTAWriter.h" +#include "TTAReader.h" #include "WavFile.h" #include "TTAError.h" #include "TTATester.h" diff --git a/ttalib-1.1/TTALib.vcproj b/ttalib-1.1/TTALib.vcproj deleted file mode 100644 index f981002..0000000 --- a/ttalib-1.1/TTALib.vcproj +++ /dev/null @@ -1,416 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/ttalib-1.1/TTALib.vcxproj b/ttalib-1.1/TTALib.vcxproj index c19fd95..440bc43 100644 --- a/ttalib-1.1/TTALib.vcxproj +++ b/ttalib-1.1/TTALib.vcxproj @@ -101,7 +101,6 @@ false EnableFastChecks MultiThreadedDebugDLL - Use Level3 ProgramDatabase Cdecl @@ -121,7 +120,6 @@ false Default MultiThreadedDebugDLL - Use Level3 ProgramDatabase Cdecl @@ -137,7 +135,6 @@ OnlyExplicitInline WIN32;NDEBUG;%(PreprocessorDefinitions) false - Use Level4 @@ -163,7 +160,6 @@ false StreamingSIMDExtensions Fast - Use Level4 @@ -171,12 +167,6 @@ - - Create - Create - Create - Create - @@ -187,8 +177,7 @@ - - + diff --git a/ttalib-1.1/TTAReader.cpp b/ttalib-1.1/TTAReader.cpp index aefd529..cd77cf2 100644 --- a/ttalib-1.1/TTAReader.cpp +++ b/ttalib-1.1/TTAReader.cpp @@ -27,7 +27,6 @@ * information. */ -#include "stdafx.h" #include "BitReader.h" #include "TTAReader.h" #include "filters3.h" diff --git a/ttalib-1.1/TTAReader.h b/ttalib-1.1/TTAReader.h index d680104..742451f 100644 --- a/ttalib-1.1/TTAReader.h +++ b/ttalib-1.1/TTAReader.h @@ -29,7 +29,7 @@ #pragma once -#include "ttacommon.h" +#include "TTACommon.h" #define WAVE_FORMAT_PCM 1 #define WAVE_FORMAT_IEEE_FLOAT 3 diff --git a/ttalib-1.1/TTATester.h b/ttalib-1.1/TTATester.h index c88638a..ea6db76 100644 --- a/ttalib-1.1/TTATester.h +++ b/ttalib-1.1/TTATester.h @@ -1,5 +1,5 @@ #pragma once -#include "bitreader.h" +#include "BitReader.h" namespace TTALib { diff --git a/ttalib-1.1/TTAWriter.cpp b/ttalib-1.1/TTAWriter.cpp index 066184b..6d9cb36 100644 --- a/ttalib-1.1/TTAWriter.cpp +++ b/ttalib-1.1/TTAWriter.cpp @@ -27,7 +27,6 @@ * information. */ -#include "stdafx.h" #include "BitWriter.h" #include "TTAError.h" #include "TTAWriter.h" diff --git a/ttalib-1.1/WavFile.cpp b/ttalib-1.1/WavFile.cpp index b66af87..9832a38 100644 --- a/ttalib-1.1/WavFile.cpp +++ b/ttalib-1.1/WavFile.cpp @@ -27,7 +27,6 @@ * information. */ -#include "stdafx.h" #include #include "TTACommon.h" #include "TTAError.h"