Fixed the code to actually work.

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

diff --git a/samples/widgets/makefile.bcc b/samples/widgets/makefile.bcc
index 4bb60a2856a4fa9e9f0c387d9daa0b22eb95cc68..a6cfc74bd9b2d2fb3ae710aabb75dd0170f6bc3c 100644 (file)
--- a/samples/widgets/makefile.bcc
+++ b/samples/widgets/makefile.bcc
@@ -30,6 +30,7 @@ WIDGETS_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include \
        -I. $(__DLLFLAG_p) -I.\..\..\samples $(CXXFLAGS)
 WIDGETS_OBJECTS =  \
        $(OBJS)\widgets_button.obj \
+       $(OBJS)\widgets_checkbox.obj \
        $(OBJS)\widgets_combobox.obj \
        $(OBJS)\widgets_gauge.obj \
        $(OBJS)\widgets_listbox.obj \
@@ -128,10 +129,10 @@ __RUNTIME_LIBS_7 = i
 __RUNTIME_LIBS_7 = 
 !endif
 !if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=1
+__UNICODE_DEFINE_p = -D_UNICODE
 !endif
 !if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=1
+__UNICODE_DEFINE_p_1 = -d_UNICODE
 !endif
 !if "$(MSLU)" == "1"
 __UNICOWS_LIB_p = unicows.lib
@@ -166,6 +167,9 @@ all: $(OBJS)\widgets.exe
 $(OBJS)\widgets_button.obj: .\button.cpp
        $(CXX) -q -c -P -o$@ $(WIDGETS_CXXFLAGS) $**
 
+$(OBJS)\widgets_checkbox.obj: .\checkbox.cpp
+       $(CXX) -q -c -P -o$@ $(WIDGETS_CXXFLAGS) $**
+
 $(OBJS)\widgets_combobox.obj: .\combobox.cpp
        $(CXX) -q -c -P -o$@ $(WIDGETS_CXXFLAGS) $**
 
@@ -197,14 +201,19 @@ $(OBJS)\widgets_widgets.obj: .\widgets.cpp
        $(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$(SETUPHDIR) -i. $(__DLLFLAG_p_1) -i.\..\..\samples $**
+       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include  -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i.\..\..\include -i$(SETUPHDIR) -i. $(__DLLFLAG_p_1) -i.\..\..\samples $**
 
 clean: 
        -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
        -if exist $(OBJS)\*.res del $(OBJS)\*.res
        -if exist $(OBJS)\widgets.exe del $(OBJS)\widgets.exe
+       -if exist $(OBJS)\widgets.tds del $(OBJS)\widgets.tds
+       -if exist $(OBJS)\widgets.ilc del $(OBJS)\widgets.ilc
+       -if exist $(OBJS)\widgets.ild del $(OBJS)\widgets.ild
+       -if exist $(OBJS)\widgets.ilf del $(OBJS)\widgets.ilf
+       -if exist $(OBJS)\widgets.ils del $(OBJS)\widgets.ils
 
 $(OBJS)\widgets.exe: $(WIDGETS_OBJECTS)  $(OBJS)\widgets_widgets.res
        ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa @&&|
-       c0w32.obj $(WIDGETS_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  $(__UNICOWS_LIB_p) import32.lib ole2w32.lib  import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\widgets_widgets.res
+       c0w32.obj $(WIDGETS_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib  import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\widgets_widgets.res
 |