Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

[win32] Make source code compatible with VS2012 #1324

Merged
merged 5 commits into from

2 participants

@Karlson2k
Collaborator

As MSVS2012 is released, here are commits that make XBMC source code compatible with latest (at the moment) MS VS and toolset.
If you want to compile on MS VS 2012 and platform toolset "Visual Studio 2012 (v110)", additional to this commits you need to:

  1. Upgrade all XBMC projects (in VS right click on root of the solution -> "Upgrade VC++ projects")

  2. Compile tinyXML with VS 2012 (download source, copy tinyxmlSTL.vcxproj to tinyxmlSTL11.vcxproj, open, upgrade project, add defines (see project\BuildDependencies\downloads\tinyxml-2.6.2_1-win32.7z\tinyxml-2.6.2-win32\readme.txt), compile as DEBUG, copy debug lib to project\BuildDependencies\lib\tinyxmlSTL11d.lib, compile as RELEASE, copy release lib to project\BuildDependencies\lib\tinyxmlSTL11.lib)

  3. Turn off for "XBMC" and "libass_dll" projects "Image Has Safe Exception Handlers" in project properties->Linker->Advanced

@Karlson2k
Collaborator

@jmarshallnz Done.

@jmarshallnz jmarshallnz was assigned
@jmarshallnz jmarshallnz merged commit 1e96c84 into xbmc:master
@Karlson2k Karlson2k deleted the Karlson2k:VS2012_compat branch
@LongChair LongChair referenced this pull request from a commit in plexinc/plex-home-theater-public
@LongChair LongChair Reset PlayList Player repeat settings on a new PQ playback.
Fixes Playback of Plex It! Queue items keys off of PQ repeat setting #1324
46da07a
@LongChair LongChair referenced this pull request from a commit in plexinc/plex-home-theater-public
@LongChair LongChair Reset PlayList Player repeat settings on a new PQ playback.
Fixes Playback of Plex It! Queue items keys off of PQ repeat setting #1324
ee29695
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
This page is out of date. Refresh to see the latest.
View
2  lib/UnrarXLib/os.hpp
@@ -55,7 +55,7 @@
#include <dir.h>
#endif
#ifdef _MSC_VER
- #define for if (0) ; else for
+// #define for if (0) ; else for
#ifndef _WIN_CE
#include <direct.h>
#endif
View
3  lib/libRTV/GuideParser.cpp
@@ -855,6 +855,7 @@ int CalculateMinutes( int seconds )
//-------------------------------------------------------------------------
//-------------------------------------------------------------------------
+#if _MSC_VER < 1700
DWORD64 ntohll(DWORD64 llValue)
{
DWORD64 retval = 0;
@@ -884,7 +885,7 @@ DWORD64 ntohll(DWORD64 llValue)
return retval;
}
-
+#endif // _MSC_VER < 1700
//-------------------------------------------------------------------------
void ConvertProgramInfoEndian(struct tagProgramInfo * strProgramInfo)
{
View
2  xbmc/PartyModeManager.cpp
@@ -665,7 +665,7 @@ void CPartyModeManager::AddToHistory(int type, int songID)
{
while (m_history.size() >= m_songsInHistory && m_songsInHistory)
m_history.erase(m_history.begin());
- m_history.push_back(make_pair<int,int>(type,songID));
+ m_history.push_back(make_pair(type,songID));
}
void CPartyModeManager::GetRandomSelection(vector< pair<int,int> >& in, unsigned int number, vector< pair<int,int> >& out)
View
2  xbmc/addons/AddonDatabase.cpp
@@ -268,7 +268,7 @@ bool CAddonDatabase::GetAddon(int id, AddonPtr& addon)
m_pDS2->query(sql.c_str());
while (!m_pDS2->eof())
{
- props.dependencies.insert(make_pair(m_pDS2->fv(0).get_asString(), make_pair(m_pDS2->fv(1).get_asString(), m_pDS2->fv(2).get_asBool())));
+ props.dependencies.insert(make_pair(m_pDS2->fv(0).get_asString(), make_pair(AddonVersion(m_pDS2->fv(1).get_asString()), m_pDS2->fv(2).get_asBool())));
m_pDS2->next();
}
View
2  xbmc/cores/dvdplayer/DVDCodecs/Video/DXVA.cpp
@@ -82,9 +82,11 @@ DEFINE_GUID(DXVADDI_Intel_ModeH264_C, 0x604F8E66,0x4951,0x4c54,0x88,0xFE,0xAB,0x
DEFINE_GUID(DXVADDI_Intel_ModeH264_E, 0x604F8E68,0x4951,0x4c54,0x88,0xFE,0xAB,0xD2,0x5C,0x15,0xB3,0xD6);
DEFINE_GUID(DXVADDI_Intel_ModeVC1_E , 0xBCC5DB6D,0xA2B6,0x4AF0,0xAC,0xE4,0xAD,0xB1,0xF7,0x87,0xBC,0x89);
+#if _MSC_VER < 1700
DEFINE_GUID(DXVA_ModeMPEG2and1_VLD, 0x86695f12,0x340e,0x4f04,0x9f,0xd3,0x92,0x53,0xdd,0x32,0x74,0x60);
// When exposed by an accelerator, indicates compliance with the August 2010 spec update
DEFINE_GUID(DXVA_ModeVC1_D2010, 0x1b81beA4,0xa0c7,0x11d3,0xb9,0x84,0x00,0xc0,0x4f,0x2e,0x73,0xc5);
+#endif
typedef struct {
const char *name;
View
8 xbmc/utils/XBMCTinyXML.h
@@ -24,11 +24,19 @@
#endif
#ifdef TARGET_WINDOWS
#define TIXML_USE_STL
+#if _MSC_VER < 1700
#ifdef _DEBUG
#pragma comment(lib, "tinyxmlSTLd.lib")
#else
#pragma comment(lib, "tinyxmlSTL.lib")
#endif
+#else // _MSC_VER < 1700
+#ifdef _DEBUG
+#pragma comment(lib, "tinyxmlSTL11d.lib")
+#else
+#pragma comment(lib, "tinyxmlSTL11.lib")
+#endif
+#endif // _MSC_VER < 1700
#else
//compile fix for TinyXml < 2.6.0
#define DOCUMENT TINYXML_DOCUMENT
Something went wrong with that request. Please try again.