Use $(OutDir) instead of explicit directories in VC10 project files.

[wxWidgets.git] / build / bakefiles / wxwin.py

diff --git a/build/bakefiles/wxwin.py b/build/bakefiles/wxwin.py
index d04413352d3701c687482a9df420e01697c40ea1..59ddd43e4e066a20aa88a9039023572e226d8ee2 100644 (file)
--- a/build/bakefiles/wxwin.py
+++ b/build/bakefiles/wxwin.py
@@ -1,7 +1,6 @@
 #
 # Helper functions for wxWidgets bakefiles
 #
 #
 # Helper functions for wxWidgets bakefiles
 #

-# $Id$

 #
 
 
 #
 
 


@@ -39,12 +38,12 @@ def mk_wxid(id):
 
 
 # All libs that are part of the main library:
 
 
 # All libs that are part of the main library:

-MAIN_LIBS = ['mono', 'base', 'core', 'adv', 'html', 'xml', 'net', 'web',
+MAIN_LIBS = ['mono', 'base', 'core', 'adv', 'html', 'xml', 'net', 'webview',

              'media', 'qa', 'xrc', 'aui', 'ribbon', 'propgrid', 'richtext', 'stc']
 # List of library names/ids for categories with different names:
 LIBS_NOGUI = ['xml', 'net']
 LIBS_GUI   = ['core', 'adv', 'html', 'gl', 'qa', 'xrc', 'media',
              'media', 'qa', 'xrc', 'aui', 'ribbon', 'propgrid', 'richtext', 'stc']
 # List of library names/ids for categories with different names:
 LIBS_NOGUI = ['xml', 'net']
 LIBS_GUI   = ['core', 'adv', 'html', 'gl', 'qa', 'xrc', 'media',

-              'aui', 'propgrid', 'richtext', 'stc', 'ribbon', 'web']
+              'aui', 'propgrid', 'richtext', 'stc', 'ribbon', 'webview']

 # Additional libraries that must be linked in:
 EXTRALIBS = {
     'gl' : '$(EXTRALIBS_OPENGL)',
 # Additional libraries that must be linked in:
 EXTRALIBS = {
     'gl' : '$(EXTRALIBS_OPENGL)',


@@ -52,7 +51,6 @@ EXTRALIBS = {
     'html' : '$(EXTRALIBS_HTML)',
     'adv' : '$(PLUGIN_ADV_EXTRALIBS)',
     'media' : '$(EXTRALIBS_MEDIA)',
     'html' : '$(EXTRALIBS_HTML)',
     'adv' : '$(PLUGIN_ADV_EXTRALIBS)',
     'media' : '$(EXTRALIBS_MEDIA)',

-    'web' : '$(EXTRALIBS_WEB)',

 }
 
 def mkLibName(wxid):
 }
 
 def mkLibName(wxid):