зеркало из https://github.com/mozilla/gecko-dev.git
[OS/2] Bug 363903: fix java-xpcom build break on OS/2, p=abwillis1, r=jhpedemonte
This commit is contained in:
Родитель
7da20483cd
Коммит
e4d298cac7
|
@ -102,12 +102,17 @@ ifeq ($(OS_ARCH),WINNT)
|
||||||
CPPSRCS += dlldeps-javaxpcom.cpp
|
CPPSRCS += dlldeps-javaxpcom.cpp
|
||||||
LOCAL_INCLUDES += -I$(JAVA_INCLUDE_PATH)/win32
|
LOCAL_INCLUDES += -I$(JAVA_INCLUDE_PATH)/win32
|
||||||
else
|
else
|
||||||
|
ifeq ($(OS_ARCH),OS2)
|
||||||
|
CPPSRCS += dlldeps-javaxpcom.cpp
|
||||||
|
LOCAL_INCLUDES += -I$(JAVA_INCLUDE_PATH)/os2
|
||||||
|
else
|
||||||
ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
|
ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
|
||||||
EXTRA_DSO_LDOPTS += -framework JavaVM
|
EXTRA_DSO_LDOPTS += -framework JavaVM
|
||||||
else
|
else
|
||||||
LOCAL_INCLUDES += -I$(JAVA_INCLUDE_PATH)/linux
|
LOCAL_INCLUDES += -I$(JAVA_INCLUDE_PATH)/linux
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
endif
|
||||||
|
|
||||||
SHARED_LIBRARY_LIBS += \
|
SHARED_LIBRARY_LIBS += \
|
||||||
$(DEPTH)/extensions/java/xpcom/src/$(LIB_PREFIX)javaxpcom.$(LIB_SUFFIX)
|
$(DEPTH)/extensions/java/xpcom/src/$(LIB_PREFIX)javaxpcom.$(LIB_SUFFIX)
|
||||||
|
|
Загрузка…
Ссылка в новой задаче