Menu
▾
▴
[OMPT-svn-commit] SF.net SVN: modplug:[1935] trunk/OpenMPT
|
From: <man...@us...> - 2013-04-22 20:32:45
|
Revision: 1935
http://sourceforge.net/p/modplug/code/1935
Author: manxorist
Date: 2013-04-22 20:32:38 +0000 (Mon, 22 Apr 2013)
Log Message:
-----------
[Ref] Split compile time build configuration out of stdafx.h into common/BuildSettings.h
Modified Paths:
--------------
trunk/OpenMPT/common/stdafx.h
trunk/OpenMPT/mptrack/mptrack_08.vcproj
trunk/OpenMPT/mptrack/mptrack_10.vcxproj
trunk/OpenMPT/mptrack/mptrack_10.vcxproj.filters
Added Paths:
-----------
trunk/OpenMPT/common/BuildSettings.h
Added: trunk/OpenMPT/common/BuildSettings.h
===================================================================
--- trunk/OpenMPT/common/BuildSettings.h (rev 0)
+++ trunk/OpenMPT/common/BuildSettings.h 2013-04-22 20:32:38 UTC (rev 1935)
@@ -0,0 +1,104 @@
+/*
+ * BuildSettings.h
+ * ---------------
+ * Purpose: Global, user settable compile time flags (and some global system header configuration)
+ * Notes : (currently none)
+ * Authors: OpenMPT Devs
+ * The OpenMPT source code is released under the BSD license. Read LICENSE for more details.
+ */
+
+
+#pragma once
+
+
+
+// Use inline assembly at all
+#define ENABLE_ASM
+
+// inline assembly requires MSVC compiler
+#if defined(ENABLE_ASM) && defined(_MSC_VER)
+
+// Generate general x86 inline assembly.
+#define ENABLE_X86
+
+// Generate inline assembly using MMX instructions (only used when the CPU supports it).
+#define ENABLE_MMX
+
+// Generate inline assembly using 3DNOW instructions (only used when the CPU supports it).
+#define ENABLE_3DNOW
+
+// Generate inline assembly using SSE instructions (only used when the CPU supports it).
+#define ENABLE_SSE
+
+#endif // ENABLE_ASM
+
+// Disable any debug logging
+//#define NO_LOGGING
+
+// Disable unarchiving support
+//#define NO_ARCHIVE_SUPPORT
+
+// Disable the built-in reverb effect
+//#define NO_REVERB
+
+// Disable built-in miscellaneous DSP effects (surround, mega bass, noise reduction)
+//#define NO_DSP
+
+// Disable the built-in equalizer.
+//#define NO_EQ
+
+// Disable the built-in automatic gain control
+//#define NO_AGC
+
+// Define to build without ASIO support; makes build possible without ASIO SDK.
+//#define NO_ASIO
+
+// (HACK) Define to build without VST support; makes build possible without VST SDK.
+//#define NO_VST
+
+// Define to build without portaudio.
+//#define NO_PORTAUDIO
+
+// Define to build without MO3 support.
+//#define NO_MO3_SUPPORT
+
+// Define to build without DirectSound support.
+//#define NO_DSOUND
+
+// Define to build without FLAC support
+//#define NO_FLAC
+
+// Define to build without MP3 import support (via mpg123)
+//#define NO_MP3_SAMPLES
+
+
+
+#ifdef _MSC_VER
+#define VC_EXTRALEAN // Exclude rarely-used stuff from Windows headers
+#endif
+
+#ifdef _WIN32
+
+#define _WIN32_WINNT 0x0500 // 0x0500 = Windows 2000
+
+// no stupid min/max macros
+#define NOMINMAX
+// windows excludes
+#define NOMCX
+// mmreg excludes
+#define NOMMIDS
+#define NOJPEGDIB
+#define NONEWIC
+#define NOBITMAP
+// mmsystem excludes
+#define MMNODRV
+#define MMNOMCI
+
+#endif
+
+#ifdef _MSC_VER
+#define _CRT_SECURE_NO_WARNINGS // Define to disable the "This function or variable may be unsafe" warnings.
+#define _CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES 1
+#define _CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT 1
+#define _SCL_SECURE_NO_WARNINGS
+#endif
Property changes on: trunk/OpenMPT/common/BuildSettings.h
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/x-chdr
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/OpenMPT/common/stdafx.h
===================================================================
--- trunk/OpenMPT/common/stdafx.h 2013-04-22 20:30:56 UTC (rev 1934)
+++ trunk/OpenMPT/common/stdafx.h 2013-04-22 20:32:38 UTC (rev 1935)
@@ -1,7 +1,7 @@
/*
* StdAfx.h
* --------
- * Purpose: Include file for standard system include files, or project specific include files that are used frequently, but are changed infrequently
+ * Purpose: Include file for standard system include files, or project specific include files that are used frequently, but are changed infrequently. Also includes the global build settings from BuildSettings.h.
* Notes : (currently none)
* Authors: Olivier Lapicque
* OpenMPT Devs
@@ -11,28 +11,8 @@
#pragma once
-#define VC_EXTRALEAN // Exclude rarely-used stuff from Windows headers
+#include "BuildSettings.h"
-#define _WIN32_WINNT 0x0500 // 0x0500 = Windows 2000
-
-// no stupid min/max macros
-#define NOMINMAX
-// windows excludes
-#define NOMCX
-// mmreg excludes
-#define NOMMIDS
-#define NOJPEGDIB
-#define NONEWIC
-#define NOBITMAP
-// mmsystem excludes
-#define MMNODRV
-#define MMNOMCI
-
-#define _CRT_SECURE_NO_WARNINGS // Define to disable the "This function or variable may be unsafe" warnings.
-#define _CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES 1
-#define _CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT 1
-#define _SCL_SECURE_NO_WARNINGS
-
#include <afxwin.h> // MFC core and standard components
#include <afxext.h> // MFC extensions
#include <afxcmn.h> // MFC support for Windows Common Controls
@@ -40,76 +20,21 @@
#include <afxole.h>
#include <windowsx.h>
+#ifdef _MSC_VER
#pragma warning(disable:4201)
+#endif
#include <mmsystem.h>
#include <mmreg.h>
#include <msacm.h>
#include <afxdlgs.h>
+#ifdef _MSC_VER
#pragma warning(default:4201)
+#endif
#include <string>
#include <fstream>
#include <strstream>
-// Use inline assembly at all
-#define ENABLE_ASM
-
-// inline assembly requires MSVC compiler
-#if defined(ENABLE_ASM) && defined(_MSC_VER)
-
-// Generate general x86 inline assembly.
-#define ENABLE_X86
-
-// Generate inline assembly using MMX instructions (only used when the CPU supports it).
-#define ENABLE_MMX
-
-// Generate inline assembly using 3DNOW instructions (only used when the CPU supports it).
-#define ENABLE_3DNOW
-
-// Generate inline assembly using SSE instructions (only used when the CPU supports it).
-#define ENABLE_SSE
-
-#endif // ENABLE_ASM
-
-// Disable any debug logging
-//#define NO_LOGGING
-
-// Disable unarchiving support
-//#define NO_ARCHIVE_SUPPORT
-
-// Disable the built-in reverb effect
-//#define NO_REVERB
-
-// Disable built-in miscellaneous DSP effects (surround, mega bass, noise reduction)
-//#define NO_DSP
-
-// Disable the built-in equalizer.
-//#define NO_EQ
-
-// Disable the built-in automatic gain control
-//#define NO_AGC
-
-// Define to build without ASIO support; makes build possible without ASIO SDK.
-//#define NO_ASIO
-
-// (HACK) Define to build without VST support; makes build possible without VST SDK.
-//#define NO_VST
-
-// Define to build without portaudio.
-//#define NO_PORTAUDIO
-
-// Define to build without MO3 support.
-//#define NO_MO3_SUPPORT
-
-// Define to build without DirectSound support.
-//#define NO_DSOUND
-
-// Define to build without FLAC support
-//#define NO_FLAC
-
-// Define to build without MP3 import support (via mpg123)
-//#define NO_MP3_SAMPLES
-
#include "../common/typedefs.h"
// Exception type that is used to catch "operator new" exceptions.
Modified: trunk/OpenMPT/mptrack/mptrack_08.vcproj
===================================================================
--- trunk/OpenMPT/mptrack/mptrack_08.vcproj 2013-04-22 20:30:56 UTC (rev 1934)
+++ trunk/OpenMPT/mptrack/mptrack_08.vcproj 2013-04-22 20:32:38 UTC (rev 1935)
@@ -837,6 +837,10 @@
>
</File>
<File
+ RelativePath="..\common\BuildSettings.h"
+ >
+ </File>
+ <File
RelativePath=".\ChildFrm.h"
>
</File>
Modified: trunk/OpenMPT/mptrack/mptrack_10.vcxproj
===================================================================
--- trunk/OpenMPT/mptrack/mptrack_10.vcxproj 2013-04-22 20:30:56 UTC (rev 1934)
+++ trunk/OpenMPT/mptrack/mptrack_10.vcxproj 2013-04-22 20:32:38 UTC (rev 1935)
@@ -411,6 +411,7 @@
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\common\AudioCriticalSection.h" />
+ <ClInclude Include="..\common\BuildSettings.h" />
<ClInclude Include="..\common\FlagSet.h" />
<ClInclude Include="..\common\Logging.h" />
<ClInclude Include="..\common\misc_util.h" />
Modified: trunk/OpenMPT/mptrack/mptrack_10.vcxproj.filters
===================================================================
--- trunk/OpenMPT/mptrack/mptrack_10.vcxproj.filters 2013-04-22 20:30:56 UTC (rev 1934)
+++ trunk/OpenMPT/mptrack/mptrack_10.vcxproj.filters 2013-04-22 20:32:38 UTC (rev 1935)
@@ -813,6 +813,9 @@
<ClInclude Include="resource.h">
<Filter>Header Files</Filter>
</ClInclude>
+ <ClInclude Include="..\common\BuildSettings.h">
+ <Filter>Header Files\common</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="res\bitmap1.bmp">
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
