X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/25a73439590e04730168bee6b691bd6233880ad4..c15fd9fba8844fe0e7d21ffca744c053e84f7c52:/samples/calendar/makefile.bcc?ds=sidebyside diff --git a/samples/calendar/makefile.bcc b/samples/calendar/makefile.bcc index e3d1b51b42..f73d83ab97 100644 --- a/samples/calendar/makefile.bcc +++ b/samples/calendar/makefile.bcc @@ -8,7 +8,7 @@ BCCDIR = $(MAKEDIR)\.. !endif -!include ../../build/config.bcc +!include ../../build/msw/config.bcc # ------------------------------------------------------------------------- # Do not modify the rest of this file! @@ -119,6 +119,10 @@ __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 __UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=1 !endif !if "$(MONOLITHIC)" == "0" +__WXLIB_ADV_p = \ + wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv.lib +!endif +!if "$(MONOLITHIC)" == "0" __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib !endif !if "$(MONOLITHIC)" == "0" @@ -136,6 +140,8 @@ __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ __WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__ !endif +MAKEARGS = -DBUILD=$(BUILD) -DCFG=$(CFG) -DCPPFLAGS=$(CPPFLAGS) -DCXX=$(CXX) -DCXXFLAGS=$(CXXFLAGS) -DDEBUG_FLAG=$(DEBUG_FLAG) -DDEBUG_INFO=$(DEBUG_INFO) -DLDFLAGS=$(LDFLAGS) -DMONOLITHIC=$(MONOLITHIC) -DOFFICIAL_BUILD=$(OFFICIAL_BUILD) -DRUNTIME_LIBS=$(RUNTIME_LIBS) -DSHARED=$(SHARED) -DUNICODE=$(UNICODE) -DUSE_GUI=$(USE_GUI) -DWXUNIV=$(WXUNIV) + all: $(OBJS) $(OBJS): @@ -153,7 +159,7 @@ $(OBJS)\calendar_calendar.res: .\calendar.rc $(OBJS)\calendar.exe: $(CALENDAR_OBJECTS) $(OBJS)\calendar_calendar.res ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| - c0w32.obj $(CALENDAR_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 import32.lib ole2w32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\calendar_calendar.res + c0w32.obj $(CALENDAR_OBJECTS),$@,, $(__WXLIB_ADV_p) $(__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 import32.lib ole2w32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\calendar_calendar.res | clean: