Fix bustage that occurs when building with multiple toolkits but not having gtk as the default toolkit.
git-svn-id: svn://10.0.0.236/trunk@109829 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
@@ -43,17 +43,16 @@ CPPSRCS = npsimple.cpp
|
||||
|
||||
LOCAL_INCLUDES = -I$(srcdir)/.. -I$(srcdir)/../../public
|
||||
|
||||
EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_XPCOM_LIBS) -L$(DIST)/lib
|
||||
|
||||
ifdef MOZ_ENABLE_GTK
|
||||
EXTRA_DSO_LDOPTS += -lgtksuperwin
|
||||
endif
|
||||
|
||||
EXTRA_DSO_LDOPTS += $(TK_LIBS)
|
||||
EXTRA_DSO_LDOPTS += \
|
||||
-L$(DIST)/lib \
|
||||
-lgtksuperwin \
|
||||
$(MOZ_COMPONENT_XPCOM_LIBS) \
|
||||
$(MOZ_GTK_LDFLAGS) \
|
||||
$(NULL)
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
CXXFLAGS += $(MOZ_TOOLKIT_REGISTRY_CFLAGS)
|
||||
CXXFLAGS += $(MOZ_TOOLKIT_REGISTRY_CFLAGS) $(MOZ_GTK_CFLAGS)
|
||||
|
||||
libs::
|
||||
$(INSTALL) $(srcdir)/samples/embed-test.html $(DIST)/bin/res/samples
|
||||
|
||||
Reference in New Issue
Block a user