Menu
▾
▴
[OMPT-svn-commit] SF.net SVN: modplug:[1572] trunk/OpenMPT
|
From: <man...@us...> - 2013-03-15 22:09:24
|
Revision: 1572
http://sourceforge.net/p/modplug/code/1572
Author: manxorist
Date: 2013-03-15 22:09:13 +0000 (Fri, 15 Mar 2013)
Log Message:
-----------
[Var] Remove unused NO_PACKING macro, remove HAVE_DOT_NET feature macro which was always set and remove all other macro tests for MSVC compilers older than 2008.
Modified Paths:
--------------
trunk/OpenMPT/common/misc_util.cpp
trunk/OpenMPT/common/stdafx.h
trunk/OpenMPT/common/typedefs.h
trunk/OpenMPT/mptrack/EffectVis.cpp
trunk/OpenMPT/mptrack/Mptrack.cpp
trunk/OpenMPT/mptrack/mptrack_08.vcproj
trunk/OpenMPT/mptrack/mptrack_10.vcxproj
Modified: trunk/OpenMPT/common/misc_util.cpp
===================================================================
--- trunk/OpenMPT/common/misc_util.cpp 2013-03-15 20:01:21 UTC (rev 1571)
+++ trunk/OpenMPT/common/misc_util.cpp 2013-03-15 22:09:13 UTC (rev 1572)
@@ -74,15 +74,6 @@
time_t Util::sdTime::MakeGmTime(tm& timeUtc)
{
-#if (_MSC_VER < MSVC_VER_2005)
- // VC++ 2003 doesn't have _mkgmtime
- // This does not seem to work properly with DST time zones sometimes - if that's of any concern for you, please upgrade your compiler :)
- TIME_ZONE_INFORMATION tzi;
- GetTimeZoneInformation(&tzi);
- const time_t timeUtcTimeT = mktime(&timeUtc) - tzi.Bias * 60;
-#else
- const time_t timeUtcTimeT = _mkgmtime(&timeUtc);
-#endif
- return timeUtcTimeT;
+ return _mkgmtime(&timeUtc);
}
Modified: trunk/OpenMPT/common/stdafx.h
===================================================================
--- trunk/OpenMPT/common/stdafx.h 2013-03-15 20:01:21 UTC (rev 1571)
+++ trunk/OpenMPT/common/stdafx.h 2013-03-15 22:09:13 UTC (rev 1572)
@@ -13,11 +13,7 @@
#define VC_EXTRALEAN // Exclude rarely-used stuff from Windows headers
-#if _MSC_VER >= 1500
- #define _WIN32_WINNT 0x0500 // 0x0500 = Windows 2000
-#else
- #define WINVER 0x0401
-#endif
+#define _WIN32_WINNT 0x0500 // 0x0500 = Windows 2000
// windows excludes
#define NOMCX
Modified: trunk/OpenMPT/common/typedefs.h
===================================================================
--- trunk/OpenMPT/common/typedefs.h 2013-03-15 20:01:21 UTC (rev 1571)
+++ trunk/OpenMPT/common/typedefs.h 2013-03-15 22:09:13 UTC (rev 1572)
@@ -12,10 +12,6 @@
// Definitions for MSVC versions to write more understandable conditional-compilation,
// e.g. #if (_MSC_VER > MSVC_VER_2008) instead of #if (_MSC_VER > 1500)
-#define MSVC_VER_VC71 1310
-#define MSVC_VER_2003 MSVC_VER_VC71
-#define MSVC_VER_VC8 1400
-#define MSVC_VER_2005 MSVC_VER_VC8
#define MSVC_VER_VC9 1500
#define MSVC_VER_2008 MSVC_VER_VC9
#define MSVC_VER_VC10 1600
@@ -26,7 +22,7 @@
#endif
// CountOf macro computes the number of elements in a statically-allocated array.
-#if _MSC_VER >= MSVC_VER_2005
+#ifdef _MSC_VER
#define CountOf(x) _countof(x)
#else
#define CountOf(x) (sizeof(x)/sizeof(x[0]))
Modified: trunk/OpenMPT/mptrack/EffectVis.cpp
===================================================================
--- trunk/OpenMPT/mptrack/EffectVis.cpp 2013-03-15 20:01:21 UTC (rev 1571)
+++ trunk/OpenMPT/mptrack/EffectVis.cpp 2013-03-15 22:09:13 UTC (rev 1572)
@@ -412,26 +412,12 @@
{
// draw the grid
memDC.BitBlt(0, 0, m_rcDraw.Width(), m_rcDraw.Height(), &m_dcGrid, 0, 0, SRCCOPY) ;
-#ifndef HAVE_DOT_NET
-
- // VC6 TransparentBlit...
- // WINGDIAPI BOOL WINAPI TransparentBlt(HDC,int,int,int,int,HDC,int,int,int,int,UINT);
- // hDestDC, xDest, yDest, nDestWidth,nDestHeight,xSrc,ySrc,nSrcWidth,nSrcHeight, crTransparent
- // 0, , 0 ,
- unsigned int height = m_rcDraw.Height();
- unsigned int width = m_rcDraw.Width();
- // FIX ME!
- memDC.BitBlt(0,0,width, height, &m_dcNodes,width,height,PATCOPY);
- memDC.BitBlt(0,0,width, height, &m_dcPlayPos,width,height,PATCOPY);
-#endif
-
-#ifdef HAVE_DOT_NET
// merge the nodes image with the grid
memDC.TransparentBlt(0, 0, m_rcDraw.Width(), m_rcDraw.Height(), &m_dcNodes, 0, 0, m_rcDraw.Width(), m_rcDraw.Height(), 0x00000000) ;
// further merge the playpos
memDC.TransparentBlt(0, 0, m_rcDraw.Width(), m_rcDraw.Height(), &m_dcPlayPos, 0, 0, m_rcDraw.Width(), m_rcDraw.Height(), 0x00000000) ;
-#endif
+
// copy the resulting bitmap to the destination
pDC->BitBlt(LEFTBORDER, TOPBORDER, m_rcDraw.Width()+LEFTBORDER, m_rcDraw.Height()+TOPBORDER, &memDC, 0, 0, SRCCOPY) ;
}
Modified: trunk/OpenMPT/mptrack/Mptrack.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Mptrack.cpp 2013-03-15 20:01:21 UTC (rev 1571)
+++ trunk/OpenMPT/mptrack/Mptrack.cpp 2013-03-15 22:09:13 UTC (rev 1572)
@@ -640,7 +640,7 @@
CTrackApp::CTrackApp()
//--------------------
{
- #if (_MSC_VER >= MSVC_VER_2005)
+ #ifdef _MSC_VER
_CrtSetDebugFillThreshold(0); // Disable buffer filling in secure enhanced CRT functions.
#endif
Modified: trunk/OpenMPT/mptrack/mptrack_08.vcproj
===================================================================
--- trunk/OpenMPT/mptrack/mptrack_08.vcproj 2013-03-15 20:01:21 UTC (rev 1571)
+++ trunk/OpenMPT/mptrack/mptrack_08.vcproj 2013-03-15 22:09:13 UTC (rev 1572)
@@ -49,7 +49,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\common;..\soundlib;..\include;..\include\vstsdk2.4\;..\include\ASIOSDK2\common\;..\xsoundlib;..\"
- PreprocessorDefinitions="_DEBUG,WIN32,_WINDOWS,ENABLE_EQ,MODPLUG_TRACKER,NO_PACKING,HAVE_DOT_NET,ENABLE_AMD,ENABLE_SSE,ENABLE_AMDNOW,ENABLE_MMX"
+ PreprocessorDefinitions="_DEBUG,WIN32,_WINDOWS,ENABLE_EQ,MODPLUG_TRACKER,ENABLE_AMD,ENABLE_SSE,ENABLE_AMDNOW,ENABLE_MMX"
StringPooling="true"
ExceptionHandling="2"
BasicRuntimeChecks="3"
@@ -157,7 +157,7 @@
Optimization="2"
InlineFunctionExpansion="2"
AdditionalIncludeDirectories="..\common;..\soundlib;..\include;..\include\vstsdk2.4\;..\include\ASIOSDK2\common\;..\xsoundlib;..\"
- PreprocessorDefinitions="NDEBUG,WIN32,_WINDOWS,ENABLE_MMX,ENABLE_EQ,MODPLUG_TRACKER,NO_PACKING,HAVE_DOT_NET,ENABLE_AMD,ENABLE_SSE,ENABLE_AMDNOW"
+ PreprocessorDefinitions="NDEBUG,WIN32,_WINDOWS,ENABLE_MMX,ENABLE_EQ,MODPLUG_TRACKER,ENABLE_AMD,ENABLE_SSE,ENABLE_AMDNOW"
StringPooling="true"
ExceptionHandling="2"
RuntimeLibrary="0"
Modified: trunk/OpenMPT/mptrack/mptrack_10.vcxproj
===================================================================
--- trunk/OpenMPT/mptrack/mptrack_10.vcxproj 2013-03-15 20:01:21 UTC (rev 1571)
+++ trunk/OpenMPT/mptrack/mptrack_10.vcxproj 2013-03-15 22:09:13 UTC (rev 1572)
@@ -64,7 +64,7 @@
<AdditionalOptions>/EHsc %(AdditionalOptions)</AdditionalOptions>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\common;..\soundlib;..\include;..\include\vstsdk2.4\;..\include\ASIOSDK2\common\;..\xsoundlib;..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;ENABLE_EQ;MODPLUG_TRACKER;NO_PACKING;HAVE_DOT_NET;ENABLE_AMD;ENABLE_SSE;ENABLE_AMDNOW;ENABLE_MMX;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;ENABLE_EQ;MODPLUG_TRACKER;ENABLE_AMD;ENABLE_SSE;ENABLE_AMDNOW;ENABLE_MMX;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -120,7 +120,7 @@
<Optimization>MaxSpeed</Optimization>
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
<AdditionalIncludeDirectories>..\common;..\soundlib;..\include;..\include\vstsdk2.4\;..\include\ASIOSDK2\common\;..\xsoundlib;..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;ENABLE_MMX;ENABLE_EQ;MODPLUG_TRACKER;NO_PACKING;HAVE_DOT_NET;ENABLE_AMD;ENABLE_SSE;ENABLE_AMDNOW;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;ENABLE_MMX;ENABLE_EQ;MODPLUG_TRACKER;ENABLE_AMD;ENABLE_SSE;ENABLE_AMDNOW;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<BufferSecurityCheck>true</BufferSecurityCheck>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
