зеркало из https://github.com/mozilla/pjs.git
fix bug 368145 - Linker warning when linking nsBrowserApp.obj in MSVC by using -libpath for MSVC and -L for everything else
patch by Ryan VanderMeulen <ryanvm@gmail.com> r=bsmedberg
This commit is contained in:
Родитель
a58f5fc9c1
Коммит
99cdb5e993
|
@ -102,7 +102,11 @@ CPPSRCS = nsBrowserApp.cpp
|
||||||
LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre
|
LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre
|
||||||
|
|
||||||
ifdef BUILD_STATIC_LIBS
|
ifdef BUILD_STATIC_LIBS
|
||||||
|
ifdef _MSC_VER
|
||||||
|
STATIC_COMPONENTS_LINKER_PATH = -LIBPATH:$(DEPTH)/staticlib
|
||||||
|
else
|
||||||
STATIC_COMPONENTS_LINKER_PATH = -L$(DEPTH)/staticlib
|
STATIC_COMPONENTS_LINKER_PATH = -L$(DEPTH)/staticlib
|
||||||
|
endif
|
||||||
LIBS += $(DEPTH)/toolkit/xre/$(LIB_PREFIX)xulapp_s.$(LIB_SUFFIX)
|
LIBS += $(DEPTH)/toolkit/xre/$(LIB_PREFIX)xulapp_s.$(LIB_SUFFIX)
|
||||||
else
|
else
|
||||||
ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
|
ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
|
||||||
|
|
|
@ -102,7 +102,11 @@ ifdef MOZILLA_1_8_BRANCH
|
||||||
LIBS += $(DIST)/lib/$(LIB_PREFIX)xulapp_s.$(LIB_SUFFIX)
|
LIBS += $(DIST)/lib/$(LIB_PREFIX)xulapp_s.$(LIB_SUFFIX)
|
||||||
else
|
else
|
||||||
ifdef BUILD_STATIC_LIBS
|
ifdef BUILD_STATIC_LIBS
|
||||||
|
ifdef _MSC_VER
|
||||||
|
STATIC_COMPONENTS_LINKER_PATH = -LIBPATH:$(DIST)/lib/components
|
||||||
|
else
|
||||||
STATIC_COMPONENTS_LINKER_PATH = -L$(DIST)/lib/components
|
STATIC_COMPONENTS_LINKER_PATH = -L$(DIST)/lib/components
|
||||||
|
endif
|
||||||
LIBS += $(DIST)/lib/$(LIB_PREFIX)xulapp_s.$(LIB_SUFFIX)
|
LIBS += $(DIST)/lib/$(LIB_PREFIX)xulapp_s.$(LIB_SUFFIX)
|
||||||
else
|
else
|
||||||
ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
|
ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
|
||||||
|
|
|
@ -71,7 +71,11 @@ CPPSRCS = nsMailApp.cpp
|
||||||
LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre
|
LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre
|
||||||
|
|
||||||
ifdef BUILD_STATIC_LIBS
|
ifdef BUILD_STATIC_LIBS
|
||||||
|
ifdef _MSC_VER
|
||||||
|
STATIC_COMPONENTS_LINKER_PATH = -LIBPATH:$(DIST)/lib/components
|
||||||
|
else
|
||||||
STATIC_COMPONENTS_LINKER_PATH = -L$(DIST)/lib/components
|
STATIC_COMPONENTS_LINKER_PATH = -L$(DIST)/lib/components
|
||||||
|
endif
|
||||||
LIBS += $(DIST)/lib/$(LIB_PREFIX)xulapp_s.$(LIB_SUFFIX)
|
LIBS += $(DIST)/lib/$(LIB_PREFIX)xulapp_s.$(LIB_SUFFIX)
|
||||||
else
|
else
|
||||||
ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
|
ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
|
||||||
|
|
|
@ -67,7 +67,11 @@ CPPSRCS = nsSuiteApp.cpp
|
||||||
LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre
|
LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre
|
||||||
|
|
||||||
ifdef BUILD_STATIC_LIBS
|
ifdef BUILD_STATIC_LIBS
|
||||||
|
ifdef _MSC_VER
|
||||||
|
STATIC_COMPONENTS_LINKER_PATH = -LIBPATH:$(DIST)/lib/components
|
||||||
|
else
|
||||||
STATIC_COMPONENTS_LINKER_PATH = -L$(DIST)/lib/components
|
STATIC_COMPONENTS_LINKER_PATH = -L$(DIST)/lib/components
|
||||||
|
endif
|
||||||
LIBS += $(DIST)/lib/$(LIB_PREFIX)xulapp_s.$(LIB_SUFFIX)
|
LIBS += $(DIST)/lib/$(LIB_PREFIX)xulapp_s.$(LIB_SUFFIX)
|
||||||
else
|
else
|
||||||
ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
|
ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
|
||||||
|
|
Загрузка…
Ссылка в новой задаче