Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rename some projects to avoid project name clashes in samples.dsw

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43637 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2006-11-25 14:22:44 +00:00
parent 77c8787c16
commit 7dc467c500
34 changed files with 1358 additions and 1352 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
samples/html/help/Makefile.in
View File

@@ -43,14 +43,14 @@ DESTDIR =
WX_RELEASE = 2.8
WX_VERSION = $(WX_RELEASE).0
LIBDIRNAME = $(wx_top_builddir)/lib
HELP_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
HTMLHELP_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
-I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../../samples $(CPPFLAGS) \
$(CXXFLAGS)
HELP_OBJECTS = \
$(__help_os2_lib_res) \
help_help.o \
$(__help___win32rc)
HTMLHELP_OBJECTS = \
$(__htmlhelp_os2_lib_res) \
htmlhelp_help.o \
$(__htmlhelp___win32rc)
### Conditionally set variables: ###
@@ -67,9 +67,9 @@ HELP_OBJECTS = \
@COND_MONOLITHIC_1@EXTRALIBS_FOR_BASE = $(EXTRALIBS) $(EXTRALIBS_GUI)
@COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
@COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI =
@COND_PLATFORM_MAC_1@__help___mac_setfilecmd = \
@COND_PLATFORM_MAC_1@ $(SETFILE) -a C help$(EXEEXT)
@COND_PLATFORM_MAC_1@__help___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
@COND_PLATFORM_MAC_1@__htmlhelp___mac_setfilecmd = \
@COND_PLATFORM_MAC_1@ $(SETFILE) -a C htmlhelp$(EXEEXT)
@COND_PLATFORM_MAC_1@__htmlhelp___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__
@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__
@@ -85,18 +85,20 @@ HELP_OBJECTS = \
@COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL
@COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL
@COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL
COND_PLATFORM_OS2_1___help___os2_emxbindcmd = $(NM) help$(EXEEXT) | if grep -q \
pmwin.763 ; then emxbind -ep help$(EXEEXT) ; fi
@COND_PLATFORM_OS2_1@__help___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___help___os2_emxbindcmd)
COND_PLATFORM_OS2_1___htmlhelp___os2_emxbindcmd = $(NM) htmlhelp$(EXEEXT) | if \
grep -q pmwin.763 ; then emxbind -ep htmlhelp$(EXEEXT) ; fi
@COND_PLATFORM_OS2_1@__htmlhelp___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___htmlhelp___os2_emxbindcmd)
@COND_TOOLKIT_MSW@__RCDEFDIR_p = -i \
@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \
@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
@COND_PLATFORM_OS2_1@__help_os2_lib_res = \
@COND_PLATFORM_OS2_1@__htmlhelp_os2_lib_res = \
@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res
@COND_PLATFORM_MACOSX_1@__help_bundle___depname = help_bundle
@COND_TOOLKIT_COCOA@____help_BUNDLE_TGT_REF_DEP = help.app/Contents/PkgInfo
@COND_TOOLKIT_MAC@____help_BUNDLE_TGT_REF_DEP = help.app/Contents/PkgInfo
@COND_PLATFORM_MACOSX_1@__htmlhelp_bundle___depname = htmlhelp_bundle
@COND_TOOLKIT_COCOA@____htmlhelp_BUNDLE_TGT_REF_DEP = \
@COND_TOOLKIT_COCOA@ htmlhelp.app/Contents/PkgInfo
@COND_TOOLKIT_MAC@____htmlhelp_BUNDLE_TGT_REF_DEP = \
@COND_TOOLKIT_MAC@ htmlhelp.app/Contents/PkgInfo
COND_MONOLITHIC_0___WXLIB_HTML_p = \
-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html-$(WX_RELEASE)$(HOST_SUFFIX)
@COND_MONOLITHIC_0@__WXLIB_HTML_p = $(COND_MONOLITHIC_0___WXLIB_HTML_p)
@@ -106,7 +108,7 @@ COND_MONOLITHIC_0___WXLIB_CORE_p = \
COND_MONOLITHIC_0___WXLIB_BASE_p = \
-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
@COND_MONOLITHIC_0@__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
@COND_PLATFORM_WIN32_1@__help___win32rc = help_help_rc.o
@COND_PLATFORM_WIN32_1@__htmlhelp___win32rc = htmlhelp_help_rc.o
COND_MONOLITHIC_1___WXLIB_MONO_p = \
-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
@COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
@@ -132,12 +134,12 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(REZ) -d __DARWIN__ -t APPL -d \
__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) \
$(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \
$(srcdir)/../../../samples $(__RCDEFDIR_p) -i $(top_srcdir)/include -o \
help$(EXEEXT) Carbon.r sample.r
htmlhelp$(EXEEXT) Carbon.r sample.r
@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
### Targets: ###
all: help$(EXEEXT) $(__help_bundle___depname) data
all: htmlhelp$(EXEEXT) $(__htmlhelp_bundle___depname) data
install: all
@@ -148,40 +150,40 @@ install-strip: install
clean:
rm -rf ./.deps ./.pch
rm -f ./*.o
rm -f help$(EXEEXT)
rm -rf help.app
rm -f htmlhelp$(EXEEXT)
rm -rf htmlhelp.app
distclean: clean
rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
help$(EXEEXT): $(HELP_OBJECTS) $(__help___win32rc)
$(CXX) -o $@ $(HELP_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__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)
$(__help___mac_rezcmd)
$(__help___mac_setfilecmd)
$(__help___os2_emxbindcmd)
htmlhelp$(EXEEXT): $(HTMLHELP_OBJECTS) $(__htmlhelp___win32rc)
$(CXX) -o $@ $(HTMLHELP_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__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)
$(__htmlhelp___mac_rezcmd)
$(__htmlhelp___mac_setfilecmd)
$(__htmlhelp___os2_emxbindcmd)
$(SAMPLES_RPATH_POSTLINK)
help.app/Contents/PkgInfo: help$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
mkdir -p help.app/Contents
mkdir -p help.app/Contents/MacOS
mkdir -p help.app/Contents/Resources
htmlhelp.app/Contents/PkgInfo: htmlhelp$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
mkdir -p htmlhelp.app/Contents
mkdir -p htmlhelp.app/Contents/MacOS
mkdir -p htmlhelp.app/Contents/Resources
sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-e "s/EXECUTABLE/help/" \
-e "s/EXECUTABLE/htmlhelp/" \
-e "s/VERSION/$(WX_VERSION)/" \
$(top_srcdir)/src/mac/carbon/Info.plist.in >help.app/Contents/Info.plist
$(top_srcdir)/src/mac/carbon/Info.plist.in >htmlhelp.app/Contents/Info.plist
echo -n "APPL????" >help.app/Contents/PkgInfo
echo -n "APPL????" >htmlhelp.app/Contents/PkgInfo
ln -f help$(EXEEXT) help.app/Contents/MacOS/help
ln -f htmlhelp$(EXEEXT) htmlhelp.app/Contents/MacOS/htmlhelp
cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns help.app/Contents/Resources/wxmac.icns
cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns htmlhelp.app/Contents/Resources/wxmac.icns
@COND_PLATFORM_MACOSX_1@help_bundle: $(____help_BUNDLE_TGT_REF_DEP)
@COND_PLATFORM_MACOSX_1@htmlhelp_bundle: $(____htmlhelp_BUNDLE_TGT_REF_DEP)
data:
@mkdir -p ./helpfiles
@@ -195,14 +197,14 @@ data:
esac; \
done
help_help.o: $(srcdir)/help.cpp
$(CXXC) -c -o $@ $(HELP_CXXFLAGS) $(srcdir)/help.cpp
htmlhelp_help.o: $(srcdir)/help.cpp
$(CXXC) -c -o $@ $(HTMLHELP_CXXFLAGS) $(srcdir)/help.cpp
help_help_rc.o: $(srcdir)/help.rc
htmlhelp_help_rc.o: $(srcdir)/help.rc
$(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include
# Include dependency info, if present:
@IF_GNU_MAKE@-include .deps/*.d
.PHONY: all install uninstall clean distclean help_bundle data
.PHONY: all install uninstall clean distclean htmlhelp_bundle data