Rebake trunk after wxWebView merge and add missing project files for the wxWebView library.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69056 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Steve Lamerton
2011-09-11 10:12:19 +00:00
parent 86381d4297
commit 92b4653a62
162 changed files with 7748 additions and 3199 deletions

View File

@@ -65,10 +65,10 @@ LIBTYPE_SUFFIX = lib
LIBTYPE_SUFFIX = dll
!endif
!if "$(MONOLITHIC)" == "0"
EXTRALIBS_FOR_BASE =
EXTRALIBS_FOR_BASE =
!endif
!if "$(MONOLITHIC)" == "1"
EXTRALIBS_FOR_BASE =
EXTRALIBS_FOR_BASE =
!endif
!if "$(BUILD)" == "debug"
__OPTIMIZEFLAG_2 = -Od
@@ -77,13 +77,13 @@ __OPTIMIZEFLAG_2 = -Od
__OPTIMIZEFLAG_2 = -O2
!endif
!if "$(USE_THREADS)" == "0"
__THREADSFLAG_5 =
__THREADSFLAG_5 =
!endif
!if "$(USE_THREADS)" == "1"
__THREADSFLAG_5 = mt
!endif
!if "$(USE_THREADS)" == "0"
__THREADSFLAG_6 =
__THREADSFLAG_6 =
!endif
!if "$(USE_THREADS)" == "1"
__THREADSFLAG_6 = -tWM
@@ -92,13 +92,13 @@ __THREADSFLAG_6 = -tWM
__RUNTIME_LIBS_7 = -tWR
!endif
!if "$(RUNTIME_LIBS)" == "static"
__RUNTIME_LIBS_7 =
__RUNTIME_LIBS_7 =
!endif
!if "$(RUNTIME_LIBS)" == "dynamic"
__RUNTIME_LIBS_8 = i
!endif
!if "$(RUNTIME_LIBS)" == "static"
__RUNTIME_LIBS_8 =
__RUNTIME_LIBS_8 =
!endif
!if "$(WXUNIV)" == "1"
__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
@@ -222,7 +222,7 @@ $(OBJS):
all: $(OBJS)\treelist.exe
clean:
clean:
-if exist $(OBJS)\*.obj del $(OBJS)\*.obj
-if exist $(OBJS)\*.res del $(OBJS)\*.res
-if exist $(OBJS)\*.csm del $(OBJS)\*.csm
@@ -243,3 +243,4 @@ $(OBJS)\treelist_sample.res: .\..\..\samples\sample.rc
$(OBJS)\treelist_treelist.obj: .\treelist.cpp
$(CXX) -q -c -P -o$@ $(TREELIST_CXXFLAGS) .\treelist.cpp