You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by rh...@apache.org on 2010/09/21 14:15:11 UTC

svn commit: r999370 - in /subversion/branches/object-model: build.conf build/generator/gen_win.py

Author: rhuijben
Date: Tue Sep 21 12:15:10 2010
New Revision: 999370

URL: http://svn.apache.org/viewvc?rev=999370&view=rev
Log:
On the object-model branch:
Fix compilation for Windows.

* build.conf
  (libsvn++): Build as static library.

* build/generator/gen_win.py
  (get_win_includes): Add subversion/bindings/c++/include to the search
    path.

Modified:
    subversion/branches/object-model/build.conf
    subversion/branches/object-model/build/generator/gen_win.py

Modified: subversion/branches/object-model/build.conf
URL: http://svn.apache.org/viewvc/subversion/branches/object-model/build.conf?rev=999370&r1=999369&r2=999370&view=diff
==============================================================================
--- subversion/branches/object-model/build.conf (original)
+++ subversion/branches/object-model/build.conf Tue Sep 21 12:15:10 2010
@@ -530,6 +530,7 @@ path = subversion/bindings/c++
 libs = apr libsvn_subr libsvn_client
 sources = *.cpp
 install = c++-lib
+msvc-static = yes
 
 [util-cpp-test]
 description = Subversion C++ bindings tests

Modified: subversion/branches/object-model/build/generator/gen_win.py
URL: http://svn.apache.org/viewvc/subversion/branches/object-model/build/generator/gen_win.py?rev=999370&r1=999369&r2=999370&view=diff
==============================================================================
--- subversion/branches/object-model/build/generator/gen_win.py (original)
+++ subversion/branches/object-model/build/generator/gen_win.py Tue Sep 21 12:15:10 2010
@@ -892,6 +892,7 @@ class WinGeneratorBase(GeneratorBase):
 
     fakeincludes = [ self.path("subversion/include"),
                      self.path("subversion"),
+                     self.path("subversion/bindings/c++/include"),
                      self.apath(self.apr_path, "include"),
                      self.apath(self.apr_util_path, "include") ]