2012-01-03, 18:25
@dado - what compiler are you using? In MS VisualStudio Express I get:
It doesn't like the line:
Code:
C:\XBMCDevelopment\dado483-xbmc-b2c02d3\project\VS2010Express\XBMC.vcxproj : error : Unable to read the project file "XBMC.vcxproj".
C:\XBMCDevelopment\dado483-xbmc-b2c02d3\project\VS2010Express\XBMC.vcxproj(105,2): The project file could not be loaded. Name cannot begin with the '<' character, hexadecimal value 0x3C. Line 105, position 2.
It doesn't like the line:
Code:
<<<<<<< HEAD
<AdditionalIncludeDirectories>..\..\;..\..\xbmc\;..\..\xbmc\win32\;..\..\xbmc\cores\dvdplayer;..\..\lib;..\..\lib\ffmpeg;..\..\lib\ffmpeg\include-xbmc-win32;..\..\lib\liblame\include;..\..\lib\libUPnP\Platinum\Source\Devices\MediaRenderer;..\..\lib\libUPnP\Platinum\Source\Devices\MediaConnect;..\..\lib\libUPnP\Platinum\Source\Devices\MediaServer;..\..\lib\libUPnP\Platinum\Source\Platinum;..\..\lib\libUPnP\Platinum\Source\Core;..\..\lib\libUPnP\Neptune\Source\Core;..\..\lib\libUPnP\Neptune\Source\System\Win32;..\..\lib\win32\pcre;..\..\lib\win32</AdditionalIncludeDirectories>
<PreprocessorDefinitions>TARGET_WINDOWS;_WINDOWS;_MSVC;WIN32;NDEBUG;_WIN32_WINNT=0x0501;NTDDI_VERSION=0x05010300;NOMINMAX;_USE_32BIT_TIME_T;HAS_GL;__STDC_CONSTANT_MACROS;XMD_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
=======