Move #inclusion of wx/msw/winundef.h for MinGW to afterstd.h.

[wxWidgets.git] / samples / widgets / makefile.bcc

diff --git a/samples/widgets/makefile.bcc b/samples/widgets/makefile.bcc
index a796022268e7e6b49371519ad9099c86a76c0fcb..5cfde2abfbe6e84a05ab1ca85990b3253ae06b66 100644 (file)
--- a/samples/widgets/makefile.bcc
+++ b/samples/widgets/makefile.bcc
@@ -4,6 +4,9 @@
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

+!ifndef BCCDIR
+BCCDIR = $(MAKEDIR)\..
+!endif

 
 # -------------------------------------------------------------------------
 # These are configurable options:
 
 # -------------------------------------------------------------------------
 # These are configurable options:


@@ -21,7 +24,7 @@ CFG =
 !endif
 # Standard preprocessor flags (common for CC and CXX) 
 !ifndef CPPFLAGS
 !endif
 # Standard preprocessor flags (common for CC and CXX) 
 !ifndef CPPFLAGS

-CPPFLAGS = 
+CPPFLAGS = -a4 -g0 -I$(BCCDIR)\include

 !endif
 # C++ compiler 
 !ifndef CXX
 !endif
 # C++ compiler 
 !ifndef CXX


@@ -64,17 +67,13 @@ WXUNIV = 0
 # Do not modify the rest of this file!
 # -------------------------------------------------------------------------
 
 # Do not modify the rest of this file!
 # -------------------------------------------------------------------------
 

-!ifndef BCCDIR
-BCCDIR=$(MAKEDIR)\..
-!endif
-

 !if "$(BCCDIR)" == "\.."
 !error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4
 !endif
 
 ### Variables: ###
 
 !if "$(BCCDIR)" == "\.."
 !error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4
 !endif
 
 ### Variables: ###
 

-OBJS = objs_bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+OBJS = bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)

 WIDGETS_CXXFLAGS = $(CPPFLAGS)  -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I./../../include -I./../../lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I./../../src/tiff -I./../../src/jpeg -I./../../src/png -I./../../src/zlib  -I./../../src/regex -I. $(__DLLFLAG_p) $(CXXFLAGS)
 
 ### Conditionally set variables: ###
 WIDGETS_CXXFLAGS = $(CPPFLAGS)  -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I./../../include -I./../../lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I./../../src/tiff -I./../../src/jpeg -I./../../src/png -I./../../src/zlib  -I./../../src/regex -I. $(__DLLFLAG_p) $(CXXFLAGS)
 
 ### Conditionally set variables: ###


@@ -116,6 +115,9 @@ __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1
 __UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=1
 !endif
 !if "$(MONOLITHIC)" == "0"
 __UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=1
 !endif
 !if "$(MONOLITHIC)" == "0"

+__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
+!endif
+!if "$(MONOLITHIC)" == "0"

 __WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib
 !endif
 !if "$(MONOLITHIC)" == "1"
 __WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib
 !endif
 !if "$(MONOLITHIC)" == "1"


@@ -138,37 +140,37 @@ $(OBJS):
 all: $(OBJS)\widgets.exe
 
 $(OBJS)\widgets_button.obj: .\button.cpp
 all: $(OBJS)\widgets.exe
 
 $(OBJS)\widgets_button.obj: .\button.cpp

-       $(CXX) -c -P -o$@ $(WIDGETS_CXXFLAGS) $**
+       $(CXX) -q -c -P -o$@ $(WIDGETS_CXXFLAGS) $**

 
 $(OBJS)\widgets_combobox.obj: .\combobox.cpp
 
 $(OBJS)\widgets_combobox.obj: .\combobox.cpp

-       $(CXX) -c -P -o$@ $(WIDGETS_CXXFLAGS) $**
+       $(CXX) -q -c -P -o$@ $(WIDGETS_CXXFLAGS) $**

 
 $(OBJS)\widgets_gauge.obj: .\gauge.cpp
 
 $(OBJS)\widgets_gauge.obj: .\gauge.cpp

-       $(CXX) -c -P -o$@ $(WIDGETS_CXXFLAGS) $**
+       $(CXX) -q -c -P -o$@ $(WIDGETS_CXXFLAGS) $**

 
 $(OBJS)\widgets_listbox.obj: .\listbox.cpp
 
 $(OBJS)\widgets_listbox.obj: .\listbox.cpp

-       $(CXX) -c -P -o$@ $(WIDGETS_CXXFLAGS) $**
+       $(CXX) -q -c -P -o$@ $(WIDGETS_CXXFLAGS) $**

 
 $(OBJS)\widgets_notebook.obj: .\notebook.cpp
 
 $(OBJS)\widgets_notebook.obj: .\notebook.cpp

-       $(CXX) -c -P -o$@ $(WIDGETS_CXXFLAGS) $**
+       $(CXX) -q -c -P -o$@ $(WIDGETS_CXXFLAGS) $**

 
 $(OBJS)\widgets_radiobox.obj: .\radiobox.cpp
 
 $(OBJS)\widgets_radiobox.obj: .\radiobox.cpp

-       $(CXX) -c -P -o$@ $(WIDGETS_CXXFLAGS) $**
+       $(CXX) -q -c -P -o$@ $(WIDGETS_CXXFLAGS) $**

 
 $(OBJS)\widgets_slider.obj: .\slider.cpp
 
 $(OBJS)\widgets_slider.obj: .\slider.cpp

-       $(CXX) -c -P -o$@ $(WIDGETS_CXXFLAGS) $**
+       $(CXX) -q -c -P -o$@ $(WIDGETS_CXXFLAGS) $**

 
 $(OBJS)\widgets_spinbtn.obj: .\spinbtn.cpp
 
 $(OBJS)\widgets_spinbtn.obj: .\spinbtn.cpp

-       $(CXX) -c -P -o$@ $(WIDGETS_CXXFLAGS) $**
+       $(CXX) -q -c -P -o$@ $(WIDGETS_CXXFLAGS) $**

 
 $(OBJS)\widgets_static.obj: .\static.cpp
 
 $(OBJS)\widgets_static.obj: .\static.cpp

-       $(CXX) -c -P -o$@ $(WIDGETS_CXXFLAGS) $**
+       $(CXX) -q -c -P -o$@ $(WIDGETS_CXXFLAGS) $**

 
 $(OBJS)\widgets_textctrl.obj: .\textctrl.cpp
 
 $(OBJS)\widgets_textctrl.obj: .\textctrl.cpp

-       $(CXX) -c -P -o$@ $(WIDGETS_CXXFLAGS) $**
+       $(CXX) -q -c -P -o$@ $(WIDGETS_CXXFLAGS) $**

 
 $(OBJS)\widgets_widgets.obj: .\widgets.cpp
 
 $(OBJS)\widgets_widgets.obj: .\widgets.cpp

-       $(CXX) -c -P -o$@ $(WIDGETS_CXXFLAGS) $**
+       $(CXX) -q -c -P -o$@ $(WIDGETS_CXXFLAGS) $**

 
 $(OBJS)\widgets_widgets.res: .\widgets.rc
        brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i./../../include -i./../../lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i./../../src/tiff -i./../../src/jpeg -i./../../src/png -i./../../src/zlib  -i./../../src/regex -i. $(__DLLFLAG_p_1) $**
 
 $(OBJS)\widgets_widgets.res: .\widgets.rc
        brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i./../../include -i./../../lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i./../../src/tiff -i./../../src/jpeg -i./../../src/png -i./../../src/zlib  -i./../../src/regex -i. $(__DLLFLAG_p_1) $**


@@ -184,5 +186,5 @@ uninstall:
 
 $(OBJS)\widgets.exe: $(OBJS)\widgets_button.obj $(OBJS)\widgets_combobox.obj $(OBJS)\widgets_gauge.obj $(OBJS)\widgets_listbox.obj $(OBJS)\widgets_notebook.obj $(OBJS)\widgets_radiobox.obj $(OBJS)\widgets_slider.obj $(OBJS)\widgets_spinbtn.obj $(OBJS)\widgets_static.obj $(OBJS)\widgets_textctrl.obj $(OBJS)\widgets_widgets.obj  $(OBJS)\widgets_widgets.res
        ilink32 -Tpe $(LDFLAGS) -L.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)  -aa @&&|
 
 $(OBJS)\widgets.exe: $(OBJS)\widgets_button.obj $(OBJS)\widgets_combobox.obj $(OBJS)\widgets_gauge.obj $(OBJS)\widgets_listbox.obj $(OBJS)\widgets_notebook.obj $(OBJS)\widgets_radiobox.obj $(OBJS)\widgets_slider.obj $(OBJS)\widgets_spinbtn.obj $(OBJS)\widgets_static.obj $(OBJS)\widgets_textctrl.obj $(OBJS)\widgets_widgets.obj  $(OBJS)\widgets_widgets.res
        ilink32 -Tpe $(LDFLAGS) -L.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)  -aa @&&|

-       c0w32.obj  $(OBJS)\widgets_button.obj $(OBJS)\widgets_combobox.obj $(OBJS)\widgets_gauge.obj $(OBJS)\widgets_listbox.obj $(OBJS)\widgets_notebook.obj $(OBJS)\widgets_radiobox.obj $(OBJS)\widgets_slider.obj $(OBJS)\widgets_spinbtn.obj $(OBJS)\widgets_static.obj $(OBJS)\widgets_textctrl.obj $(OBJS)\widgets_widgets.obj,$@,, $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib  import32.lib ole2w32.lib cw32.lib,, $(OBJS)\widgets_widgets.res
+       c0w32.obj  $(OBJS)\widgets_button.obj $(OBJS)\widgets_combobox.obj $(OBJS)\widgets_gauge.obj $(OBJS)\widgets_listbox.obj $(OBJS)\widgets_notebook.obj $(OBJS)\widgets_radiobox.obj $(OBJS)\widgets_slider.obj $(OBJS)\widgets_spinbtn.obj $(OBJS)\widgets_static.obj $(OBJS)\widgets_textctrl.obj $(OBJS)\widgets_widgets.obj,$@,, $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib  import32.lib ole2w32.lib cw32.lib,, $(OBJS)\widgets_widgets.res

 |
 |