aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/libmodplug/libmodplug_2008.vcproj14
-rw-r--r--xbmc/lib/libapetag/apetaglib.c7
-rw-r--r--xbmc/lib/libapetag/libapetag.vcproj16
3 files changed, 26 insertions, 11 deletions
diff --git a/lib/libmodplug/libmodplug_2008.vcproj b/lib/libmodplug/libmodplug_2008.vcproj
index 40974ee4ed..78fe2b5eaf 100644
--- a/lib/libmodplug/libmodplug_2008.vcproj
+++ b/lib/libmodplug/libmodplug_2008.vcproj
@@ -21,7 +21,8 @@
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="4"
- CharacterSet="2"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ CharacterSet="0"
>
<Tool
Name="VCPreBuildEventTool"
@@ -45,7 +46,8 @@
PreprocessorDefinitions="WIN32;_DEBUG;_LIB;MSC_VER;_CRT_SECURE_NO_WARNINGS"
MinimalRebuild="true"
BasicRuntimeChecks="3"
- RuntimeLibrary="3"
+ RuntimeLibrary="1"
+ RuntimeTypeInfo="false"
UsePrecompiledHeader="0"
WarningLevel="3"
DebugInformationFormat="4"
@@ -61,6 +63,7 @@
/>
<Tool
Name="VCLibrarianTool"
+ IgnoreAllDefaultLibraries="true"
/>
<Tool
Name="VCALinkTool"
@@ -83,7 +86,8 @@
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="4"
- CharacterSet="2"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ CharacterSet="0"
WholeProgramOptimization="1"
>
<Tool
@@ -107,8 +111,9 @@
EnableIntrinsicFunctions="true"
AdditionalIncludeDirectories="&quot;$(InputDir)\libmodplug&quot;"
PreprocessorDefinitions="WIN32;NDEBUG;_LIB;MSC_VER;_CRT_SECURE_NO_WARNINGS"
- RuntimeLibrary="2"
+ RuntimeLibrary="0"
EnableFunctionLevelLinking="true"
+ RuntimeTypeInfo="false"
UsePrecompiledHeader="0"
WarningLevel="3"
DebugInformationFormat="3"
@@ -124,6 +129,7 @@
/>
<Tool
Name="VCLibrarianTool"
+ IgnoreAllDefaultLibraries="true"
/>
<Tool
Name="VCALinkTool"
diff --git a/xbmc/lib/libapetag/apetaglib.c b/xbmc/lib/libapetag/apetaglib.c
index 546675b699..b68fff50e2 100644
--- a/xbmc/lib/libapetag/apetaglib.c
+++ b/xbmc/lib/libapetag/apetaglib.c
@@ -43,8 +43,12 @@
#ifdef _MSC_VER
#pragma warning(disable: 4996)
#define strcasecmp stricmp
-#define truncate
#define snprintf _snprintf
+#define USE_CHSIZE
+#define S_IRUSR 0
+#define S_IWUSR 0
+#define S_IRGRP 0
+#define S_IWGRP 0
#if defined(_WIN64)
typedef __int64 ssize_t;
#else
@@ -601,7 +605,6 @@ apetag_free (apetag *mem_cnt)
}
-
/**
\brief read id3v1 and add frames
diff --git a/xbmc/lib/libapetag/libapetag.vcproj b/xbmc/lib/libapetag/libapetag.vcproj
index 69ce1de143..89dae4a314 100644
--- a/xbmc/lib/libapetag/libapetag.vcproj
+++ b/xbmc/lib/libapetag/libapetag.vcproj
@@ -41,10 +41,11 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_LIB;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS"
MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="1"
+ RuntimeTypeInfo="false"
UsePrecompiledHeader="0"
WarningLevel="3"
DebugInformationFormat="4"
@@ -60,6 +61,8 @@
/>
<Tool
Name="VCLibrarianTool"
+ IgnoreAllDefaultLibraries="true"
+ IgnoreDefaultLibraryNames=""
/>
<Tool
Name="VCALinkTool"
@@ -104,9 +107,11 @@
Name="VCCLCompilerTool"
Optimization="2"
EnableIntrinsicFunctions="true"
- PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
- RuntimeLibrary="2"
+ PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS"
+ ExceptionHandling="0"
+ RuntimeLibrary="0"
EnableFunctionLevelLinking="true"
+ RuntimeTypeInfo="false"
UsePrecompiledHeader="0"
WarningLevel="3"
DebugInformationFormat="3"
@@ -122,6 +127,7 @@
/>
<Tool
Name="VCLibrarianTool"
+ IgnoreAllDefaultLibraries="true"
/>
<Tool
Name="VCALinkTool"