X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/61aba4609aa384e8906e76715ea483cbf46c6725..908c4056119d49b1b90f6618d38c85d080db152d:/samples/makefile.gcc diff --git a/samples/makefile.gcc b/samples/makefile.gcc index 1010be6b95..b052a943e6 100644 --- a/samples/makefile.gcc +++ b/samples/makefile.gcc @@ -25,9 +25,8 @@ MAKEARGS = LINK_DLL_FLAGS="$(LINK_DLL_FLAGS)" \ USE_OPENGL="$(USE_OPENGL)" USE_QA="$(USE_QA)" \ USE_EXCEPTIONS="$(USE_EXCEPTIONS)" USE_RTTI="$(USE_RTTI)" \ USE_THREADS="$(USE_THREADS)" USE_CAIRO="$(USE_CAIRO)" \ - USE_GDIPLUS="$(USE_GDIPLUS)" OFFICIAL_BUILD="$(OFFICIAL_BUILD)" \ - VENDOR="$(VENDOR)" WX_FLAVOUR="$(WX_FLAVOUR)" \ - WX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" CFG="$(CFG)" \ + OFFICIAL_BUILD="$(OFFICIAL_BUILD)" VENDOR="$(VENDOR)" \ + WX_FLAVOUR="$(WX_FLAVOUR)" WX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" CFG="$(CFG)" \ CPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" CPPUNIT_LIBS="$(CPPUNIT_LIBS)" \ RUNTIME_LIBS="$(RUNTIME_LIBS)" GCC_VERSION="$(GCC_VERSION)" @@ -37,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 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 widgets wizard wrapsizer xrc clean: -if exist .\*.o del .\*.o @@ -113,6 +112,7 @@ clean: $(MAKE) -C toolbar -f makefile.gcc $(MAKEARGS) clean $(MAKE) -C treectrl -f makefile.gcc $(MAKEARGS) clean $(MAKE) -C typetest -f makefile.gcc $(MAKEARGS) 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 widgets -f makefile.gcc $(MAKEARGS) clean @@ -334,6 +334,9 @@ treectrl: typetest: $(MAKE) -C typetest -f makefile.gcc $(MAKEARGS) all +uiaction: + $(MAKE) -C uiaction -f makefile.gcc $(MAKEARGS) all + validate: $(MAKE) -C validate -f makefile.gcc $(MAKEARGS) all @@ -361,8 +364,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 validate vscroll widgets wizard \ - wrapsizer xrc memcheck + taskbar text thread toolbar treectrl typetest uiaction validate vscroll widgets \ + wizard wrapsizer xrc memcheck SHELL := $(COMSPEC)