Various fixes to contrib bakefiles. Regenerated corresponding
Makefile.in. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23553 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -15,6 +15,7 @@ CXX = @CXX@
|
||||
CXXFLAGS = @CXXFLAGS@
|
||||
EXEEXT = @EXEEXT@
|
||||
EXTRALIBS = @EXTRALIBS@
|
||||
EXTRALIBS_ESD = @EXTRALIBS_ESD@
|
||||
EXTRALIBS_GUI = @EXTRALIBS_GUI@
|
||||
HOST_SUFFIX = @HOST_SUFFIX@
|
||||
LDFLAGS = @LDFLAGS@
|
||||
@@ -115,7 +116,7 @@ install: all
|
||||
install-strip: install
|
||||
|
||||
mmboard$(EXEEXT): $(MMBOARD_OBJECTS) $(__mmboard___win32rc)
|
||||
$(CXX) -o $@ $(MMBOARD_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia-2.5$(HOST_SUFFIX) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI)
|
||||
$(CXX) -o $@ $(MMBOARD_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_mmedia-2.5$(HOST_SUFFIX) $(EXTRALIBS_ESD) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI)
|
||||
$(__mmboard___mac_rezcmd)
|
||||
$(__mmboard___mac_setfilecmd)
|
||||
$(SAMPLES_RPATH_POSTLINK)
|
||||
|
@@ -4,12 +4,17 @@
|
||||
<include file="../../../build/bakefiles/common_samples.bkl"/>
|
||||
<include file="../../../build/bakefiles/common_contrib.bkl"/>
|
||||
|
||||
<if cond="FORMAT=='autoconf'">
|
||||
<option name="EXTRALIBS_ESD"/>
|
||||
</if>
|
||||
|
||||
<exe id="mmboard" template="wx_contrib_sample" template_append="wx_append">
|
||||
<sources>
|
||||
mmboard.cpp
|
||||
mmbman.cpp
|
||||
</sources>
|
||||
<wx-lib>mmedia</wx-lib>
|
||||
<ldlibs cond="FORMAT=='autoconf'">$(EXTRALIBS_ESD)</ldlibs>
|
||||
<wx-lib>core</wx-lib>
|
||||
<wx-lib>base</wx-lib>
|
||||
<win32-res>mmboard.rc</win32-res>
|
||||
|
Reference in New Issue
Block a user