Menu
▾
▴
[OMPT-svn-commit] SF.net SVN: modplug:[1463] trunk/OpenMPT
|
From: <sag...@us...> - 2012-12-15 18:41:43
|
Revision: 1463
http://sourceforge.net/p/modplug/code/1463
Author: saga-games
Date: 2012-12-15 18:41:37 +0000 (Sat, 15 Dec 2012)
Log Message:
-----------
[Int] Fixed VS2008 project (apparently, the TR1 stuff is still required there...)
Modified Paths:
--------------
trunk/OpenMPT/common/misc_util.h
trunk/OpenMPT/mptrack/MPTRACK_08.sln
trunk/OpenMPT/mptrack/mptrack_08.vcproj
trunk/OpenMPT/soundlib/FileReader.h
trunk/OpenMPT/ungzip/ungzip_08.vcproj
trunk/OpenMPT/unzip/unzip_08.vcproj
Modified: trunk/OpenMPT/common/misc_util.h
===================================================================
--- trunk/OpenMPT/common/misc_util.h 2012-12-15 15:45:30 UTC (rev 1462)
+++ trunk/OpenMPT/common/misc_util.h 2012-12-15 18:41:37 UTC (rev 1463)
@@ -14,11 +14,31 @@
#include <string>
#include <limits>
#include "typedefs.h"
-#if _HAS_TR1
- #include <type_traits>
-#endif
#include <io.h> // for _taccess
+#if(_MSC_VER < 1600)
+ // has_trivial_assign for VS2008
+ namespace std
+ {
+ namespace tr1
+ {
+ template <class T> struct has_trivial_assign {static const bool value = false;};
+ #define SPECIALIZE_TRIVIAL_ASSIGN(type) template <> struct has_trivial_assign<type> {static const bool value = true;}
+ SPECIALIZE_TRIVIAL_ASSIGN(int8);
+ SPECIALIZE_TRIVIAL_ASSIGN(uint8);
+ SPECIALIZE_TRIVIAL_ASSIGN(int16);
+ SPECIALIZE_TRIVIAL_ASSIGN(uint16);
+ SPECIALIZE_TRIVIAL_ASSIGN(int32);
+ SPECIALIZE_TRIVIAL_ASSIGN(uint32);
+ SPECIALIZE_TRIVIAL_ASSIGN(int64);
+ SPECIALIZE_TRIVIAL_ASSIGN(uint64);
+ #undef SPECIALIZE_TRIVIAL_ASSIGN
+ };
+ };
+#else
+#include <type_traits>
+#endif
+
//Convert object(typically number) to string
template<class T>
inline std::string Stringify(const T& x)
Modified: trunk/OpenMPT/mptrack/MPTRACK_08.sln
===================================================================
--- trunk/OpenMPT/mptrack/MPTRACK_08.sln 2012-12-15 15:45:30 UTC (rev 1462)
+++ trunk/OpenMPT/mptrack/MPTRACK_08.sln 2012-12-15 18:41:37 UTC (rev 1463)
@@ -6,6 +6,7 @@
{44316F22-904E-48AA-B841-5A3A6AC77319} = {44316F22-904E-48AA-B841-5A3A6AC77319}
{FAE39936-1DC7-40BB-AD3F-3B5B9E9AB0E8} = {FAE39936-1DC7-40BB-AD3F-3B5B9E9AB0E8}
{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8} = {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}
+ {4CEFBC84-C215-11DB-8314-0800200C9A66} = {4CEFBC84-C215-11DB-8314-0800200C9A66}
{CF3C2CA5-5D45-4635-BBA4-C1F435E10896} = {CF3C2CA5-5D45-4635-BBA4-C1F435E10896}
{FF541CE2-DAA1-4F84-9883-0A0F111BAA0B} = {FF541CE2-DAA1-4F84-9883-0A0F111BAA0B}
EndProjectSection
@@ -15,6 +16,9 @@
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "unrar", "..\unrar\unrar_08.vcproj", "{FF541CE2-DAA1-4F84-9883-0A0F111BAA0B}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "unzip", "..\unzip\unzip_08.vcproj", "{44316F22-904E-48AA-B841-5A3A6AC77319}"
+ ProjectSection(ProjectDependencies) = postProject
+ {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8} = {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}
+ EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xsoundlib", "..\xsoundlib\xsoundlib_08.vcproj", "{DCC2BB2F-6778-4FD3-9C00-D6CD8DC917B8}"
EndProject
Modified: trunk/OpenMPT/mptrack/mptrack_08.vcproj
===================================================================
--- trunk/OpenMPT/mptrack/mptrack_08.vcproj 2012-12-15 15:45:30 UTC (rev 1462)
+++ trunk/OpenMPT/mptrack/mptrack_08.vcproj 2012-12-15 18:41:37 UTC (rev 1463)
@@ -48,7 +48,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\unlha;..\unzip;..\unrar;..\soundlib;..\include;..\include\vstsdk2.4\;..\include\ASIOSDK2\common\;..\xsoundlib;..\"
+ AdditionalIncludeDirectories="..\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"
StringPooling="true"
ExceptionHandling="2"
@@ -156,7 +156,7 @@
Name="VCCLCompilerTool"
Optimization="2"
InlineFunctionExpansion="2"
- AdditionalIncludeDirectories="..\unlha;..\unzip;..\unrar;..\soundlib;..\include;..\include\vstsdk2.4\;..\include\ASIOSDK2\common\;..\xsoundlib;..\"
+ AdditionalIncludeDirectories="..\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"
StringPooling="true"
ExceptionHandling="2"
Modified: trunk/OpenMPT/soundlib/FileReader.h
===================================================================
--- trunk/OpenMPT/soundlib/FileReader.h 2012-12-15 15:45:30 UTC (rev 1462)
+++ trunk/OpenMPT/soundlib/FileReader.h 2012-12-15 18:41:37 UTC (rev 1463)
@@ -15,6 +15,7 @@
#include "Endianness.h"
#include <vector>
#include <algorithm>
+#include <limits>
//==============
Modified: trunk/OpenMPT/ungzip/ungzip_08.vcproj
===================================================================
--- trunk/OpenMPT/ungzip/ungzip_08.vcproj 2012-12-15 15:45:30 UTC (rev 1462)
+++ trunk/OpenMPT/ungzip/ungzip_08.vcproj 2012-12-15 18:41:37 UTC (rev 1463)
@@ -40,6 +40,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
+ AdditionalIncludeDirectories="../include/"
PreprocessorDefinitions="WIN32;ZLIB_WINAPI"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -103,6 +104,7 @@
Name="VCCLCompilerTool"
Optimization="2"
EnableIntrinsicFunctions="true"
+ AdditionalIncludeDirectories="../include/"
PreprocessorDefinitions="WIN32;ZLIB_WINAPI"
RuntimeLibrary="0"
EnableFunctionLevelLinking="true"
Modified: trunk/OpenMPT/unzip/unzip_08.vcproj
===================================================================
--- trunk/OpenMPT/unzip/unzip_08.vcproj 2012-12-15 15:45:30 UTC (rev 1462)
+++ trunk/OpenMPT/unzip/unzip_08.vcproj 2012-12-15 18:41:37 UTC (rev 1463)
@@ -2,8 +2,8 @@
<VisualStudioProject
ProjectType="Visual C++"
Version="9,00"
- Name="ungzip"
- ProjectGUID="{94CD7910-649A-4075-9F33-7EBEE614FD45}"
+ Name="unzip"
+ ProjectGUID="{44316F22-904E-48AA-B841-5A3A6AC77319}"
RootNamespace="ungzip"
TargetFrameworkVersion="196613"
>
@@ -40,6 +40,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
+ AdditionalIncludeDirectories="../include/zlib/"
PreprocessorDefinitions="WIN32;ZLIB_WINAPI"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -103,6 +104,7 @@
Name="VCCLCompilerTool"
Optimization="2"
EnableIntrinsicFunctions="true"
+ AdditionalIncludeDirectories="../include/zlib/"
PreprocessorDefinitions="WIN32;ZLIB_WINAPI"
RuntimeLibrary="0"
EnableFunctionLevelLinking="true"
@@ -149,7 +151,7 @@
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
- RelativePath=".\ungzip.cpp"
+ RelativePath=".\unzip.cpp"
>
</File>
</Filter>
@@ -159,7 +161,7 @@
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
>
<File
- RelativePath=".\ungzip.h"
+ RelativePath=".\unzip.h"
>
</File>
</Filter>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
