[sm130futures] Well, Windows was easy on mad.
This commit is contained in:
@@ -10,9 +10,9 @@
|
|||||||
#include <map>
|
#include <map>
|
||||||
|
|
||||||
#if defined(_WINDOWS) || defined(MACOSX)
|
#if defined(_WINDOWS) || defined(MACOSX)
|
||||||
#include "mad-0.15.1b/mad.h"
|
#include "../extern/mad-0.15.1b/mad.h"
|
||||||
#ifdef _MSC_VER
|
#ifdef _MSC_VER
|
||||||
#pragma comment(lib, "mad-0.15.1b/msvc++/Release/libmad.lib")
|
#pragma comment(lib, "../extern/mad-0.15.1b/msvc++/Release/libmad.lib")
|
||||||
#endif //_MSC_VER
|
#endif //_MSC_VER
|
||||||
#else
|
#else
|
||||||
#include <mad.h>
|
#include <mad.h>
|
||||||
|
|||||||
@@ -50,7 +50,7 @@
|
|||||||
<Tool
|
<Tool
|
||||||
Name="VCCLCompilerTool"
|
Name="VCCLCompilerTool"
|
||||||
Optimization="0"
|
Optimization="0"
|
||||||
AdditionalIncludeDirectories=".;vorbis;libjpeg;"..\extern\lua-5.1\src";ffmpeg\modern_working\include;BaseClasses;"..\extern\jsoncpp\include";"..\extern\glew-1.5.8\include";..\extern\pcre"
|
AdditionalIncludeDirectories=".;vorbis;libjpeg;"..\extern\lua-5.1\src";ffmpeg\modern_working\include;BaseClasses;"..\extern\jsoncpp\include";"..\extern\glew-1.5.8\include";..\extern\pcre;"..\extern\mad-0.15.1b""
|
||||||
PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS,WINDOWS,DEBUG,GLEW_STATIC"
|
PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS,WINDOWS,DEBUG,GLEW_STATIC"
|
||||||
ExceptionHandling="0"
|
ExceptionHandling="0"
|
||||||
BasicRuntimeChecks="3"
|
BasicRuntimeChecks="3"
|
||||||
@@ -158,7 +158,7 @@
|
|||||||
InlineFunctionExpansion="2"
|
InlineFunctionExpansion="2"
|
||||||
EnableIntrinsicFunctions="true"
|
EnableIntrinsicFunctions="true"
|
||||||
FavorSizeOrSpeed="2"
|
FavorSizeOrSpeed="2"
|
||||||
AdditionalIncludeDirectories=".;vorbis;libjpeg;"..\extern\lua-5.1\src";ffmpeg\modern_working\include;BaseClasses;"..\extern\jsoncpp\include";"..\extern\glew-1.5.8\include";..\extern\pcre"
|
AdditionalIncludeDirectories=".;vorbis;libjpeg;"..\extern\lua-5.1\src";ffmpeg\modern_working\include;BaseClasses;"..\extern\jsoncpp\include";"..\extern\glew-1.5.8\include";..\extern\pcre;"..\extern\mad-0.15.1b""
|
||||||
PreprocessorDefinitions="WIN32,NDEBUG,_WINDOWS,WINDOWS,RELEASE,GLEW_STATIC"
|
PreprocessorDefinitions="WIN32,NDEBUG,_WINDOWS,WINDOWS,RELEASE,GLEW_STATIC"
|
||||||
StringPooling="true"
|
StringPooling="true"
|
||||||
MinimalRebuild="false"
|
MinimalRebuild="false"
|
||||||
@@ -263,7 +263,7 @@
|
|||||||
<Tool
|
<Tool
|
||||||
Name="VCCLCompilerTool"
|
Name="VCCLCompilerTool"
|
||||||
Optimization="0"
|
Optimization="0"
|
||||||
AdditionalIncludeDirectories=".;vorbis;libjpeg;"..\extern\lua-5.1\src";ffmpeg\modern_working\include;BaseClasses;"..\extern\jsoncpp\include";"..\extern\glew-1.5.8\include";..\extern\pcre"
|
AdditionalIncludeDirectories=".;vorbis;libjpeg;"..\extern\lua-5.1\src";ffmpeg\modern_working\include;BaseClasses;"..\extern\jsoncpp\include";"..\extern\glew-1.5.8\include";..\extern\pcre;"..\extern\mad-0.15.1b""
|
||||||
PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS,WINDOWS,DEBUG,GLEW_STATIC"
|
PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS,WINDOWS,DEBUG,GLEW_STATIC"
|
||||||
ExceptionHandling="0"
|
ExceptionHandling="0"
|
||||||
BasicRuntimeChecks="0"
|
BasicRuntimeChecks="0"
|
||||||
@@ -371,7 +371,7 @@
|
|||||||
InlineFunctionExpansion="2"
|
InlineFunctionExpansion="2"
|
||||||
EnableIntrinsicFunctions="true"
|
EnableIntrinsicFunctions="true"
|
||||||
FavorSizeOrSpeed="1"
|
FavorSizeOrSpeed="1"
|
||||||
AdditionalIncludeDirectories=".;vorbis;libjpeg;"..\extern\lua-5.1\src";ffmpeg\modern_working\include;BaseClasses;"..\extern\jsoncpp\include";"..\extern\glew-1.5.8\include";..\extern\pcre"
|
AdditionalIncludeDirectories=".;vorbis;libjpeg;"..\extern\lua-5.1\src";ffmpeg\modern_working\include;BaseClasses;"..\extern\jsoncpp\include";"..\extern\glew-1.5.8\include";..\extern\pcre;"..\extern\mad-0.15.1b""
|
||||||
PreprocessorDefinitions="WIN32,NDEBUG,_WINDOWS,WINDOWS,RELEASE,GLEW_STATIC"
|
PreprocessorDefinitions="WIN32,NDEBUG,_WINDOWS,WINDOWS,RELEASE,GLEW_STATIC"
|
||||||
StringPooling="true"
|
StringPooling="true"
|
||||||
MinimalRebuild="false"
|
MinimalRebuild="false"
|
||||||
|
|||||||
Reference in New Issue
Block a user