[ros-diffs] [jgardou] 49546: [STLPORT] - move headers to include directory - delete some incidentally committed things

jgardou at svn.reactos.org jgardou at svn.reactos.org
Wed Nov 10 17:36:29 UTC 2010


Author: jgardou
Date: Wed Nov 10 17:36:28 2010
New Revision: 49546

URL: http://svn.reactos.org/svn/reactos?rev=49546&view=rev
Log:
[STLPORT]
  - move headers to include directory
  - delete some incidentally committed things

Added:
    branches/cmake-bringup/include/stlport/
      - copied from r49543, branches/cmake-bringup/lib/3rdparty/stlport/stlport/
Removed:
    branches/cmake-bringup/lib/3rdparty/stlport/build/Makefiles/nmake/UpgradeLog.XML
    branches/cmake-bringup/lib/3rdparty/stlport/build/Makefiles/nmake/_UpgradeReport_Files/
    branches/cmake-bringup/lib/3rdparty/stlport/stlport/
Modified:
    branches/cmake-bringup/CMakeMacros.cmake

Modified: branches/cmake-bringup/CMakeMacros.cmake
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/CMakeMacros.cmake?rev=49546&r1=49545&r2=49546&view=diff
==============================================================================
--- branches/cmake-bringup/CMakeMacros.cmake [iso-8859-1] (original)
+++ branches/cmake-bringup/CMakeMacros.cmake [iso-8859-1] Wed Nov 10 17:36:28 2010
@@ -121,7 +121,7 @@
 ENDMACRO(add_minicd)
 
 macro(set_cpp)
-  include_directories(BEFORE ${REACTOS_SOURCE_DIR}/lib/3rdparty/stlport/stlport)
+  include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/stlport)
   set(IS_CPP 1)
 endmacro()
 

Removed: branches/cmake-bringup/lib/3rdparty/stlport/build/Makefiles/nmake/UpgradeLog.XML
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/3rdparty/stlport/build/Makefiles/nmake/UpgradeLog.XML?rev=49545&view=auto
==============================================================================
--- branches/cmake-bringup/lib/3rdparty/stlport/build/Makefiles/nmake/UpgradeLog.XML [iso-8859-1] (original)
+++ branches/cmake-bringup/lib/3rdparty/stlport/build/Makefiles/nmake/UpgradeLog.XML (removed)
@@ -1,12 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?><?xml-stylesheet type='text/xsl' href='_UpgradeReport_Files/UpgradeReport.xslt'?><UpgradeLog>
-<Properties><Property Name="Solution" Value="targets">
-</Property><Property Name="Fichier solution" Value="D:\Programmation\reactos_cmake\lib\3rdparty\stlport\build\Makefiles\nmake\targets.sln">
-</Property><Property Name="Date" Value="vendredi 1 octobre 2010">
-</Property><Property Name="Time" Value="11:21:33">
-</Property></Properties><Event ErrorLevel="0" Project="targets" Source="targets.mak" Description="Converting project file 'D:\Programmation\reactos_cmake\lib\3rdparty\stlport\build\Makefiles\nmake\targets.mak'.">
-</Event><Event ErrorLevel="2" Project="D:\Programmation\reactos_cmake\lib\3rdparty\stlport\build\Makefiles\nmake\targets.mak" Source="" Description="The following error has occurred during XML parsing:&#xA;&#xA;File: D:\Programmation\reactos_cmake\lib\3rdparty\stlport\build\Makefiles\nmake\targets.mak&#xA;Line: 1&#xA;Column: 1&#xA;Error Message:&#xA;Syntaxe de document incorrecte.&#xA;&#xA;The file 'D:\Programmation\reactos_cmake\lib\3rdparty\stlport\build\Makefiles\nmake\targets.mak' has failed to load.">
-</Event><Event ErrorLevel="2" Project="targets" Source="targets.mak" Description="La balise de fin xs:choice ne correspond pas à la balise de début xs:sequence.&#xA;">
-</Event><Event ErrorLevel="2" Project="targets" Source="targets.mak" Description="La mise à niveau du projet a échoué.">
-</Event><Event ErrorLevel="3" Project="targets" Source="targets.mak" Description="Non convertie">
-</Event><Event ErrorLevel="2" Project="" Source="targets.mak" Description="La mise à niveau du projet a échoué.">
-</Event></UpgradeLog>




More information about the Ros-diffs mailing list