Set MOZ_UNICHARUTIL_LIBS & friends in config.mk so that we can test for USE_SHORT_LIBNAME as needed. Should get the OS/2 build further along.
git-svn-id: svn://10.0.0.236/trunk@106465 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
@@ -35,10 +35,6 @@ MOZ_GFX_TOOLKIT = $(MOZ_WIDGET_TOOLKIT)
|
||||
|
||||
MOZ_JS_LIBS = @MOZ_JS_LIBS@
|
||||
|
||||
MOZ_UNICHARUTIL_LIBS = $(DIST)/lib/libunicharutil_s.$(LIB_SUFFIX)
|
||||
MOZ_REGISTRY_LIBS = $(DIST)/lib/libmozreg_s.$(LIB_SUFFIX)
|
||||
MOZ_WIDGET_SUPPORT_LIBS = $(DIST)/lib/libwidgetsupport_s.$(LIB_SUFFIX)
|
||||
|
||||
MOZ_GFX_TOOLKIT_LDFLAGS = @MOZ_GFX_TOOLKIT_LDFLAGS@
|
||||
MOZ_WIDGET_TOOLKIT_LDFLAGS = @MOZ_WIDGET_TOOLKIT_LDFLAGS@
|
||||
|
||||
|
||||
@@ -180,6 +180,15 @@ NSS_LIBS = \
|
||||
$(DIST)/lib/libdbm.$(LIB_SUFFIX) \
|
||||
$(NULL)
|
||||
|
||||
ifdef USE_SHORT_LIBNAME
|
||||
MOZ_UNICHARUTIL_LIBS = $(DIST)/lib/libucharuti.$(LIB_SUFFIX)
|
||||
else
|
||||
MOZ_UNICHARUTIL_LIBS = $(DIST)/lib/libunicharutil_s.$(LIB_SUFFIX)
|
||||
endif
|
||||
|
||||
MOZ_REGISTRY_LIBS = $(DIST)/lib/libmozreg_s.$(LIB_SUFFIX)
|
||||
MOZ_WIDGET_SUPPORT_LIBS = $(DIST)/lib/libwidgetsupport_s.$(LIB_SUFFIX)
|
||||
|
||||
# determine debug-related options
|
||||
DEBUG_FLAGS :=
|
||||
|
||||
|
||||
Reference in New Issue
Block a user