diff options
| author | jmarshallnz <jmarshallnz@svn> | 2010-02-16 03:59:53 +0000 |
|---|---|---|
| committer | jmarshallnz <jmarshallnz@svn> | 2010-02-16 03:59:53 +0000 |
| commit | ecdcd65c68b513979eb9d74c02d7e4f0b2df30bb (patch) | |
| tree | 3c2ce027c8547444750103ef1773c7dbdf9c3bae | |
| parent | c4ca7933f73d1bfdf6c6f8add09bb2821e6ccb71 (diff) | |
fixed: win32 build. No idea if libmodplug does anything useful.
git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk@27870 568bbfeb-2a22-0410-94d2-cc84cf5bfa90
| -rw-r--r-- | lib/libmodplug/libmodplug_2008.vcproj | 26 | ||||
| -rw-r--r-- | project/VS2008Express/XBMC for Windows.sln | 1 | ||||
| -rw-r--r-- | xbmc/DllPaths_win32.h | 1 |
3 files changed, 20 insertions, 8 deletions
diff --git a/lib/libmodplug/libmodplug_2008.vcproj b/lib/libmodplug/libmodplug_2008.vcproj index 78fe2b5eaf..33a1b1f3b5 100644 --- a/lib/libmodplug/libmodplug_2008.vcproj +++ b/lib/libmodplug/libmodplug_2008.vcproj @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="9,00"
+ Version="9.00"
Name="libmodplug_2008"
ProjectGUID="{C15B374E-7126-48FF-B618-A375D7B17FCF}"
RootNamespace="libmodplug_2008"
@@ -20,7 +20,7 @@ Name="Debug|Win32"
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
- ConfigurationType="4"
+ ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
CharacterSet="0"
>
@@ -62,13 +62,16 @@ Name="VCPreLinkEventTool"
/>
<Tool
- Name="VCLibrarianTool"
- IgnoreAllDefaultLibraries="true"
+ Name="VCLinkerTool"
+ OutputFile="..\..\system\players\paplayer\libmodplug.dll"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
+ Name="VCManifestTool"
+ />
+ <Tool
Name="VCXDCMakeTool"
/>
<Tool
@@ -78,6 +81,9 @@ Name="VCFxCopTool"
/>
<Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
@@ -85,7 +91,7 @@ Name="Release|Win32"
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
- ConfigurationType="4"
+ ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
CharacterSet="0"
WholeProgramOptimization="1"
@@ -128,13 +134,16 @@ Name="VCPreLinkEventTool"
/>
<Tool
- Name="VCLibrarianTool"
- IgnoreAllDefaultLibraries="true"
+ Name="VCLinkerTool"
+ OutputFile="..\..\system\players\paplayer\libmodplug.dll"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
+ Name="VCManifestTool"
+ />
+ <Tool
Name="VCXDCMakeTool"
/>
<Tool
@@ -144,6 +153,9 @@ Name="VCFxCopTool"
/>
<Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
diff --git a/project/VS2008Express/XBMC for Windows.sln b/project/VS2008Express/XBMC for Windows.sln index 5eca85df27..01e5d68437 100644 --- a/project/VS2008Express/XBMC for Windows.sln +++ b/project/VS2008Express/XBMC for Windows.sln @@ -7,7 +7,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "XBMC", "XBMC.vcproj", "{3A6 {9E74DF3B-9343-4689-B0EC-4451617F9489} = {9E74DF3B-9343-4689-B0EC-4451617F9489}
{D8097C41-605D-4917-8957-9DF7F44A18CD} = {D8097C41-605D-4917-8957-9DF7F44A18CD}
{7A74ED4B-2BF5-47D7-B43E-C80F714417FB} = {7A74ED4B-2BF5-47D7-B43E-C80F714417FB}
- {C15B374E-7126-48FF-B618-A375D7B17FCF} = {C15B374E-7126-48FF-B618-A375D7B17FCF}
{E465056A-C6F3-45EE-B791-CAF8E0CE629D} = {E465056A-C6F3-45EE-B791-CAF8E0CE629D}
{B2975495-FBE4-4F94-AAC5-B21A9842BF50} = {B2975495-FBE4-4F94-AAC5-B21A9842BF50}
{76850A99-4EC7-4196-B3EA-E4120A00E8A6} = {76850A99-4EC7-4196-B3EA-E4120A00E8A6}
diff --git a/xbmc/DllPaths_win32.h b/xbmc/DllPaths_win32.h index f1f6bee748..54c073f8dd 100644 --- a/xbmc/DllPaths_win32.h +++ b/xbmc/DllPaths_win32.h @@ -30,6 +30,7 @@ #define DLL_PATH_WMA_CODEC "special://xbmc/system/players/paplayer/wma.dll" #define DLL_PATH_YM_CODEC "special://xbmc/system/players/paplayer/stsoundlibrary.dll" #define DLL_PATH_SHN_CODEC "special://xbmc/system/players/paplayer/libshnplay.dll" +#define DLL_PATH_MODPLUG_CODEC "special://xbmc/system/players/paplayer/libmodplug.dll" /* dvdplayer */ #define DLL_PATH_LIBASS "special://xbmc/system/players/dvdplayer/libass.dll" |