rebaked with baefile rev 928
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43062 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
		| @@ -15,9 +15,10 @@ WINDRES = @WINDRES@ | ||||
| REZ = @REZ@ | ||||
| SETFILE = @SETFILE@ | ||||
| NM = @NM@ | ||||
| BK_DEPS = @BK_DEPS@ | ||||
| srcdir = @srcdir@ | ||||
| top_srcdir = @top_srcdir@ | ||||
| top_builddir = @top_builddir@ | ||||
| LIBS = @LIBS@ | ||||
| LDFLAGS_GUI = @LDFLAGS_GUI@ | ||||
| CXX = @CXX@ | ||||
| CXXFLAGS = @CXXFLAGS@ | ||||
| @@ -33,13 +34,14 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ | ||||
| HOST_SUFFIX = @HOST_SUFFIX@ | ||||
| SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ | ||||
| SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@ | ||||
| wx_top_builddir = @wx_top_builddir@ | ||||
|  | ||||
| ### Variables: ### | ||||
|  | ||||
| DESTDIR =  | ||||
| WX_RELEASE = 2.7 | ||||
| WX_VERSION = $(WX_RELEASE).2 | ||||
| LIBDIRNAME = $(top_builddir)lib | ||||
| LIBDIRNAME = $(wx_top_builddir)/lib | ||||
| HTMLCTRL_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ | ||||
| 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \ | ||||
| 	-I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../../samples $(CPPFLAGS) \ | ||||
| @@ -52,7 +54,7 @@ HTMLCTRL_OBJECTS =  \ | ||||
| ### Conditionally set variables: ### | ||||
|  | ||||
| @COND_DEPS_TRACKING_0@CXXC = $(CXX) | ||||
| @COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX) | ||||
| @COND_DEPS_TRACKING_1@CXXC = $(BK_DEPS) $(CXX) | ||||
| @COND_USE_GUI_0@PORTNAME = base | ||||
| @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) | ||||
| @COND_TOOLKIT_MAC@WXBASEPORT = _carbon | ||||
| @@ -151,7 +153,7 @@ distclean: clean | ||||
| 	rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile | ||||
|  | ||||
| htmlctrl$(EXEEXT): $(HTMLCTRL_OBJECTS) $(__htmlctrl___win32rc) | ||||
| 	$(CXX) -o $@ $(HTMLCTRL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) | ||||
| 	$(CXX) -o $@ $(HTMLCTRL_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(LIBS) $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) | ||||
| 	$(__htmlctrl___mac_rezcmd) | ||||
| 	$(__htmlctrl___mac_setfilecmd) | ||||
| 	$(__htmlctrl___os2_emxbindcmd) | ||||
|   | ||||
		Reference in New Issue
	
	Block a user