[ 1505048 ] wxHtml rendering of underlined text

[wxWidgets.git] / samples / makefile.bcc

diff --git a/samples/makefile.bcc b/samples/makefile.bcc
index edf1f9f2ca701e9d82b6d19dd105b7b39b81c0b7..35d91c2e050beeb0d7d4dfef7e052db11404303a 100644 (file)
--- a/samples/makefile.bcc
+++ b/samples/makefile.bcc
@@ -27,7 +27,8 @@ MAKEARGS = -DCC="$(CC)" -DCXX="$(CXX)" -DCFLAGS="$(CFLAGS)" \
        -DUNICODE="$(UNICODE)" -DMSLU="$(MSLU)" -DBUILD="$(BUILD)" \
        -DDEBUG_INFO="$(DEBUG_INFO)" -DDEBUG_FLAG="$(DEBUG_FLAG)" \
        -DMONOLITHIC="$(MONOLITHIC)" -DUSE_GUI="$(USE_GUI)" \
-       -DUSE_HTML="$(USE_HTML)" -DUSE_XRC="$(USE_XRC)" \
+       -DUSE_HTML="$(USE_HTML)" -DUSE_MEDIA="$(USE_MEDIA)" -DUSE_XRC="$(USE_XRC)" \
+       -DUSE_AUI="$(USE_AUI)" -DUSE_RICHTEXT="$(USE_RICHTEXT)" \
        -DUSE_OPENGL="$(USE_OPENGL)" -DUSE_ODBC="$(USE_ODBC)" -DUSE_QA="$(USE_QA)" \
        -DUSE_EXCEPTIONS="$(USE_EXCEPTIONS)" -DUSE_RTTI="$(USE_RTTI)" \
        -DUSE_THREADS="$(USE_THREADS)" -DOFFICIAL_BUILD="$(OFFICIAL_BUILD)" \
@@ -42,7 +43,7 @@ MAKEARGS = -DCC="$(CC)" -DCXX="$(CXX)" -DCFLAGS="$(CFLAGS)" \
 
 ### Targets: ###
 
-all: access artprov calendar caret checklst config console controls db dialogs dialup display dnd docview docvwmdi dragimag drawing dynamic erase event exec except font grid help htlbox html image internat ipc joytest keyboard layout listbox listctrl mdi mediaplayer memcheck menu minifram minimal mobile multimon nativdlg notebook oleauto opengl ownerdrw png popup printing propsize regtest render rotate sashtest scroll scrollsub shaped sockets sound splash splitter statbar taskbar text thread toolbar treectrl typetest validate vscroll widgets wizard mfc
+all: access artprov calendar caret checklst config combo console controls db dialogs dialup display dnd docview docvwmdi dragimag drawing dynamic erase event exec except font grid help htlbox html image internat ipc joytest keyboard layout listbox listctrl mdi mediaplayer memcheck menu minifram minimal mobile multimon nativdlg notebook oleauto opengl ownerdrw png popup printing propsize regtest render rotate sashtest scroll scrollsub shaped sockets sound splash splitter statbar taskbar text thread toolbar treectrl typetest validate vscroll widgets wizard mfc
 
 clean: 
        -if exist .\*.obj del .\*.obj
@@ -72,6 +73,10 @@ clean:
        @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>config.bat
        call config.bat
        @del config.bat
+       @echo cd combo >combo.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>combo.bat
+       call combo.bat
+       @del combo.bat
        @echo cd console >console.bat
        @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>console.bat
        call console.bat
@@ -385,6 +390,12 @@ config:
        call config.bat
        @del config.bat
 
+combo: 
+       @echo cd combo >combo.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>combo.bat
+       call combo.bat
+       @del combo.bat
+
 console: 
        @echo cd console >console.bat
        @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>console.bat