summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Chapman <dave@dchapman.com>2007-05-16 20:11:03 +0000
committerDave Chapman <dave@dchapman.com>2007-05-16 20:11:03 +0000
commitaffab26a5fd531ace1ce85ab75da89cfc9dcd73f (patch)
tree5fe8b700c4fbedc75a7c624768e56e34d8890532
parentde6b78a2fa487f195d9e66b5b0d825d910caaf36 (diff)
downloadrockbox-affab26a5fd531ace1ce85ab75da89cfc9dcd73f.tar.gz
rockbox-affab26a5fd531ace1ce85ab75da89cfc9dcd73f.zip
Sync the Mac OS X makefile - add the wxhtml library
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@13399 a1c6a512-1295-4272-9138-f99709370657
-rwxr-xr-xrbutil/Makefile.macosx3
1 files changed, 2 insertions, 1 deletions
diff --git a/rbutil/Makefile.macosx b/rbutil/Makefile.macosx
index 2914939418..94805666eb 100755
--- a/rbutil/Makefile.macosx
+++ b/rbutil/Makefile.macosx
@@ -111,6 +111,7 @@ __WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
111 111
112__WXLIB_ADV_p = -lwx_mac_adv$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) 112__WXLIB_ADV_p = -lwx_mac_adv$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
113__WXLIB_NET_p = -lwx_base_carbon_net-$(WX_RELEASE)$(HOST_SUFFIX) 113__WXLIB_NET_p = -lwx_base_carbon_net-$(WX_RELEASE)$(HOST_SUFFIX)
114__WXLIB_HTML_p = -lwx_mac_html-$(WX_RELEASE)$(HOST_SUFFIX)
114 115
115#__rbutil___win32rc = rbutil_rc.o 116#__rbutil___win32rc = rbutil_rc.o
116COND_MONOLITHIC_1___WXLIB_MONO_p = \ 117COND_MONOLITHIC_1___WXLIB_MONO_p = \
@@ -161,7 +162,7 @@ distclean: clean
161 rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile 162 rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
162 163
163rbutil$(EXEEXT): $(RBUTIL_OBJECTS) $(__rbutil___win32rc) 164rbutil$(EXEEXT): $(RBUTIL_OBJECTS) $(__rbutil___win32rc)
164 $(CXX) -o $@ $(RBUTIL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__WXLIB_ADV_p) $(__WXLIB_NET_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) 165 $(CXX) -o $@ $(RBUTIL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LIBS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__WXLIB_ADV_p) $(__WXLIB_NET_p) $(__WXLIB_HTML_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)
165 $(__rbutil___mac_rezcmd) 166 $(__rbutil___mac_rezcmd)
166 $(__rbutil___mac_setfilecmd) 167 $(__rbutil___mac_setfilecmd)
167 $(__rbutil___os2_emxbindcmd) 168 $(__rbutil___os2_emxbindcmd)