Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

18
samples/makefile.gcc
View File

@@ -19,10 +19,10 @@ MAKEARGS = LINK_DLL_FLAGS="$(LINK_DLL_FLAGS)" \
UNICODE="$(UNICODE)" MSLU="$(MSLU)" BUILD="$(BUILD)" \
DEBUG_INFO="$(DEBUG_INFO)" DEBUG_FLAG="$(DEBUG_FLAG)" \
MONOLITHIC="$(MONOLITHIC)" USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" \
USE_MEDIA="$(USE_MEDIA)" USE_XRC="$(USE_XRC)" USE_AUI="$(USE_AUI)" \
USE_RIBBON="$(USE_RIBBON)" USE_PROPGRID="$(USE_PROPGRID)" \
USE_RICHTEXT="$(USE_RICHTEXT)" USE_STC="$(USE_STC)" \
USE_OPENGL="$(USE_OPENGL)" USE_QA="$(USE_QA)" \
USE_WEBVIEW="$(USE_WEBVIEW)" USE_MEDIA="$(USE_MEDIA)" USE_XRC="$(USE_XRC)" \
USE_AUI="$(USE_AUI)" USE_RIBBON="$(USE_RIBBON)" \
USE_PROPGRID="$(USE_PROPGRID)" USE_RICHTEXT="$(USE_RICHTEXT)" \
USE_STC="$(USE_STC)" USE_OPENGL="$(USE_OPENGL)" USE_QA="$(USE_QA)" \
USE_EXCEPTIONS="$(USE_EXCEPTIONS)" USE_RTTI="$(USE_RTTI)" \
USE_THREADS="$(USE_THREADS)" USE_CAIRO="$(USE_CAIRO)" \
OFFICIAL_BUILD="$(OFFICIAL_BUILD)" VENDOR="$(VENDOR)" \
@@ -36,7 +36,7 @@ MAKEARGS = LINK_DLL_FLAGS="$(LINK_DLL_FLAGS)" \
### Targets: ###
all: access animate artprov aui calendar caret clipboard collpane combo config console controls dataview dialogs dialup display dll dnd docview dragimag drawing erase event except exec font grid help htlbox html image internat ipc joytest keyboard layout listctrl mdi mediaplayer menu minimal nativdlg notebook oleauto opengl ownerdrw popup power printing propgrid regtest render ribbon richtext sashtest scroll shaped sockets sound splash splitter statbar stc svg taborder taskbar text thread toolbar treectrl typetest uiaction validate vscroll widgets wizard wrapsizer xrc
all: access animate artprov aui calendar caret clipboard collpane combo config console controls dataview dialogs dialup display dll dnd docview dragimag drawing erase event except exec font grid help htlbox html image internat ipc joytest keyboard layout listctrl mdi mediaplayer menu minimal nativdlg notebook oleauto opengl ownerdrw popup power printing propgrid regtest render ribbon richtext sashtest scroll shaped sockets sound splash splitter statbar stc svg taborder taskbar text thread toolbar treectrl typetest uiaction validate vscroll webview widgets wizard wrapsizer xrc
clean:
-if exist .\*.o del .\*.o
@@ -115,6 +115,7 @@ clean:
$(MAKE) -C uiaction -f makefile.gcc $(MAKEARGS) clean
$(MAKE) -C validate -f makefile.gcc $(MAKEARGS) clean
$(MAKE) -C vscroll -f makefile.gcc $(MAKEARGS) clean
$(MAKE) -C webview -f makefile.gcc $(MAKEARGS) clean
$(MAKE) -C widgets -f makefile.gcc $(MAKEARGS) clean
$(MAKE) -C wizard -f makefile.gcc $(MAKEARGS) clean
$(MAKE) -C wrapsizer -f makefile.gcc $(MAKEARGS) clean
@@ -343,6 +344,9 @@ validate:
vscroll:
$(MAKE) -C vscroll -f makefile.gcc $(MAKEARGS) all
webview:
$(MAKE) -C webview -f makefile.gcc $(MAKEARGS) all
widgets:
$(MAKE) -C widgets -f makefile.gcc $(MAKEARGS) all
@@ -364,8 +368,8 @@ memcheck:
keyboard layout listctrl mdi mediaplayer menu minimal nativdlg notebook oleauto \
opengl ownerdrw popup power printing propgrid regtest render ribbon richtext \
sashtest scroll shaped sockets sound splash splitter statbar stc svg taborder \
taskbar text thread toolbar treectrl typetest uiaction validate vscroll widgets \
wizard wrapsizer xrc memcheck
taskbar text thread toolbar treectrl typetest uiaction validate vscroll webview \
widgets wizard wrapsizer xrc memcheck
SHELL := $(COMSPEC)