Skip to content
Browse files

Merge pull request #252 from margro/fix_win_build

[Gotham] Windows build fixes for WMC
  • Loading branch information...
2 parents 63d52ae + b8896eb commit 2c283c91a2c159b53f0a618dd0dc0d8c9f45f923 @opdenkamp committed Jan 2, 2014
View
17 addons/pvr.wmc/project/VS2010Express/pvrclient_wmc.vcxproj
@@ -12,7 +12,7 @@
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{6834B003-2511-4745-818D-F418E87DD941}</ProjectGuid>
- <RootNamespace>pvrclient_demo</RootNamespace>
+ <RootNamespace>pvr.wmc</RootNamespace>
<ProjectName>pvr.wmc</ProjectName>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
@@ -41,15 +41,13 @@
<OutDir>..\..\addon\</OutDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <TargetExt>.dll</TargetExt>
<TargetName>XBMC_WMC_win32</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<OutDir>..\..\addon\</OutDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <TargetExt>.pvr</TargetExt>
- <TargetName>XBMC_Demo_win32</TargetName>
+ <TargetName>XBMC_WMC_win32</TargetName>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
@@ -65,13 +63,10 @@
<ShowProgress>LinkVerbose</ShowProgress>
</Link>
<PostBuildEvent>
- <Command>if "$(ComputerName)" == "MORBO" robocopy $(TargetDir) "\\mediaserver\VDsoftware\pvr.wmc (gotham)\pvr.wmc" /s /NP
-if "$(ComputerName)" == "SCARECROW" robocopy $(TargetDir) d:\0\dev\repos\gotham\scarecrow420_xbmc\addons\pvr.wmc /s /NP
-if errorlevel 1 exit 0 else exit %errorlevel%</Command>
+ <Command>
+ </Command>
</PostBuildEvent>
- <PreBuildEvent>
- <Command>"$(SolutionDir)\ConfigureAddonXML.bat"</Command>
- </PreBuildEvent>
+ <PreBuildEvent />
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
@@ -80,7 +75,7 @@ if errorlevel 1 exit 0 else exit %errorlevel%</Command>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<AdditionalIncludeDirectories>..\..\..\..\xbmc;..\..\..\..\lib;..\..\..\..\lib\platform\windows</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_WINDLL;_CRT_SECURE_NO_WARNINGS;_USE_32BIT_TIME_T;_WINSOCKAPI_;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>_WINDLL;TARGET_WINDOWS;_CRT_SECURE_NO_WARNINGS;_USE_32BIT_TIME_T;_WINSOCKAPI_;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
</ClCompile>
<Link>
View
2 project/VS2010Express/ConfigureAddonXML.bat
@@ -11,7 +11,7 @@ cd "%SCRIPT_PATH%..\..\addons"
FOR /F "tokens=*" %%S IN ('dir /B "pvr.*"') DO (
echo Configuring %%S
cd "%%S\addon"
- %SED% "s/@OS@/wingl windx/" addon.xml.in > addon.xml
+ %SED% -e "s/@OS@/wingl windx/" -e "s/@ARCHITECTURE@/x86/" addon.xml.in > addon.xml
cd ..\..
)

0 comments on commit 2c283c9

Please sign in to comment.
Something went wrong with that request. Please try again.