re-added info after installation and added samples target to the main makefile
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22731 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -352,6 +352,13 @@ HTMLLIB_OBJECTS = \
|
||||
$(OBJS)\htmllib_htmllbox.o
|
||||
LIBDIRNAME = \
|
||||
..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
|
||||
MAKEARGS = CPPFLAGS=$(CPPFLAGS) DEBUG_FLAG=$(DEBUG_FLAG) LDFLAGS=$(LDFLAGS) \
|
||||
CC=$(CC) USE_GUI=$(USE_GUI) MONOLITHIC=$(MONOLITHIC) CXXFLAGS=$(CXXFLAGS) \
|
||||
GCC_VERSION=$(GCC_VERSION) USE_HTML=$(USE_HTML) BUILD=$(BUILD) \
|
||||
DEBUG_INFO=$(DEBUG_INFO) VENDOR=$(VENDOR) UNICODE=$(UNICODE) \
|
||||
OFFICIAL_BUILD=$(OFFICIAL_BUILD) MSLU=$(MSLU) WXUNIV=$(WXUNIV) \
|
||||
RUNTIME_LIBS=$(RUNTIME_LIBS) CXX=$(CXX) CFG=$(CFG) CFLAGS=$(CFLAGS) \
|
||||
SHARED=$(SHARED) USE_ODBC=$(USE_ODBC) USE_OPENGL=$(USE_OPENGL)
|
||||
MONODLL_CFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \
|
||||
-DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
|
||||
$(__UNICODE_DEFINE_p) -I..\..\include -I$(LIBDIRNAME) -I..\..\src\tiff \
|
||||
@@ -9507,6 +9514,9 @@ endif
|
||||
endif
|
||||
endif
|
||||
|
||||
samples:
|
||||
$(MAKE) -C ..\..\samples -f makefile.gcc $(MAKEARGS) all
|
||||
|
||||
$(LIBDIRNAME)\wx\setup.h:
|
||||
if not exist $(LIBDIRNAME)\wx\setup.h copy ..\..\include\wx\msw\setup.h $(LIBDIRNAME)\wx\setup.h
|
||||
|
||||
@@ -9564,4 +9574,4 @@ $(LIBDIRNAME)\libwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_xml.a: $(XMLLIB_OBJECTS)
|
||||
endif
|
||||
endif
|
||||
|
||||
.PHONY: all clean setup_h
|
||||
.PHONY: all clean samples setup_h
|
||||
|
Reference in New Issue
Block a user