908f89a2bf
loading: it depends on jvm.dll, which was not on my path. I had to add %JDKHOME%\jre\bin\client to my path and now it loaded. Thanks to shaver and plasticmillion on #developers for the tip to use depends.exe, the Dependency Walker. What a nice tool. Of course, there is now a crash after it loads, which will be my next step after this checkin. A plugins/src/iPlugletEngine.idl A plugins/src/iPlugletManager.idl - make IDL files for our external interfaces. M plugins/src/Makefile.in - move PlugletEngine.cpp to the top of the list. M plugins/src/PlugletEngine.cpp M plugins/src/PlugletEngine.h - big changes here. Make this a proper generic XPCOM component. - use the iPlugletManager interface, and the nsICategoryManager to make sure we get called at startup. M plugins/src/Pluglet.cpp M plugins/src/Pluglet.h M plugins/src/PlugletFactory.cpp M plugins/src/PlugletFactory.h M plugins/src/PlugletInputStream.cpp M plugins/src/PlugletInputStream.h M plugins/src/PlugletLoader.cpp M plugins/src/PlugletManager.cpp M plugins/src/PlugletPeer.cpp M plugins/src/PlugletStreamInfo.cpp M plugins/src/PlugletStreamListener.cpp M plugins/src/PlugletViewWindows.cpp M plugins/src/PlugletsDir.cpp M plugins/src/Registry.cpp - remove static method PlugletEngine::GetJNIEnv, in favor of instance method and use of nsIServiceManager. git-svn-id: svn://10.0.0.236/trunk@200339 18797224-902f-48f8-a5cc-f745e15eee43
137 lines
3.4 KiB
Makefile
137 lines
3.4 KiB
Makefile
#!gmake
|
|
#
|
|
# The contents of this file are subject to the Netscape Public
|
|
# License Version 1.1 (the "License"); you may not use this file
|
|
# except in compliance with the License. You may obtain a copy of
|
|
# the License at http://www.mozilla.org/NPL/
|
|
#
|
|
# Software distributed under the License is distributed on an "AS
|
|
# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
|
|
# implied. See the License for the specific language governing
|
|
# rights and limitations under the License.
|
|
#
|
|
# The Original Code is mozilla.org code.
|
|
#
|
|
# The Initial Developer of the Original Code is Netscape
|
|
# Communications Corporation. Portions created by Netscape are
|
|
# Copyright (C) 1998 Netscape Communications Corporation. All
|
|
# Rights Reserved.
|
|
#
|
|
# Contributor(s):
|
|
|
|
DEPTH=../../..
|
|
topsrcdir = @top_srcdir@
|
|
srcdir = @srcdir@
|
|
VPATH = @srcdir@
|
|
|
|
include $(DEPTH)/config/autoconf.mk
|
|
|
|
include $(topsrcdir)/config/config.mk
|
|
|
|
LIBRARY_NAME = pluglet
|
|
MODULE = pluglet
|
|
IS_COMPONENT = 1
|
|
|
|
ifeq ($(OS_ARCH),Linux)
|
|
INCLUDES := -I$(MOZ_JDKHOME)/include -I$(MOZ_JDKHOME)/include/linux $(INCLUDES) \
|
|
-I$(DEPTH)/widget/src/gtk -I../src_share
|
|
else
|
|
ifeq ($(OS_ARCH),WINNT)
|
|
INCLUDES := -I$(MOZ_JDKHOME)/include -I$(MOZ_JDKHOME)/include/win32 $(INCLUDES) \
|
|
-I../src_share -I.
|
|
else
|
|
ifeq ($(OS_ARCH),Darwin)
|
|
INCLUDES := -I$(MOZ_JDKHOME)/include $(INCLUDES) -I../src_share -I.
|
|
else
|
|
INCLUDES := -I$(MOZ_JDKHOME)/include -I$(MOZ_JDKHOME)/include/solaris $(INCLUDES) \
|
|
-I$(DEPTH)/widget/src/gtk -I../src_share
|
|
endif
|
|
endif
|
|
endif
|
|
|
|
CPPSRCS = \
|
|
PlugletEngine.cpp \
|
|
List.cpp \
|
|
Pluglet.cpp \
|
|
PlugletFactory.cpp \
|
|
PlugletInputStream.cpp \
|
|
PlugletLoader.cpp \
|
|
PlugletManager.cpp \
|
|
PlugletPeer.cpp \
|
|
PlugletStreamInfo.cpp \
|
|
PlugletStreamListener.cpp \
|
|
PlugletsDir.cpp \
|
|
Registry.cpp \
|
|
PlugletViewFactory.cpp \
|
|
$(NULL)
|
|
|
|
ifeq ($(OS_ARCH),Linux)
|
|
CPPSRCS += \
|
|
PlugletViewMotif.cpp \
|
|
$(NULL)
|
|
else
|
|
ifeq ($(OS_ARCH),WINNT)
|
|
CPPSRCS += \
|
|
PlugletViewWindows.cpp \
|
|
$(NULL)
|
|
else
|
|
ifeq ($(OS_ARCH),Darwin)
|
|
endif
|
|
endif
|
|
endif
|
|
|
|
XPIDLSRCS = \
|
|
iPlugletEngine.idl \
|
|
iPlugletManager.idl \
|
|
$(NULL)
|
|
|
|
CXXFLAGS := $(MOZ_TOOLKIT_REGISTRY_CFLAGS) -DMOZILLA_INTERNAL_API -D_REENTRANT -DOJI_DISABLE $(CXXFLAGS)
|
|
|
|
ifeq ($(OS_ARCH),Darwin)
|
|
INCLUDES += -I$(MOZ_JDKHOME)/include -I.
|
|
DSO_LDOPTS += -L/System/Library/Frameworks/JavaVM.Framework/Libraries -ljvm_compat
|
|
DLL_SUFFIX = .jnilib
|
|
endif #DARWIN
|
|
|
|
INCLUDES += -I$(MOZILLA_FIVE_HOME)/../include/xpcom \
|
|
-I$(MOZILLA_FIVE_HOME)/../include/plugin \
|
|
-I$(MOZILLA_FIVE_HOME)/../include/string \
|
|
-I$(MOZILLA_FIVE_HOME)/../include/xpcom_obsolete \
|
|
|
|
ifeq ($(OS_ARCH),Linux)
|
|
DSO_LDOPTS += \
|
|
-L$(JAVAHOME)/jre/lib/i386 \
|
|
-L$(JAVAHOME)/jre/lib/i386/client \
|
|
-L$(JAVAHOME)/jre/lib/i386/native_threads \
|
|
-Xlinker -rpath $(JAVAHOME)/jre/lib/i386 \
|
|
-Xlinker -rpath $(JAVAHOME)/jre/lib/i386/client \
|
|
-Xlinker -rpath $(JAVAHOME)/jre/lib/i386/native_threads \
|
|
-ljvm -lhpi -ljava -lawt -lXt -lgdk -lgtkxtbin -lgtksuperwin
|
|
DEFINES += -DDISABLE_JIT
|
|
endif # LINUX
|
|
ifeq ($(OS_ARCH),WINNT)
|
|
EXTRA_LIBS += \
|
|
$(JAVAHOME)/lib/jvm.lib \
|
|
$(XPCOM_LIBS) \
|
|
$(DIST)/lib/xpcom_compat.lib \
|
|
$(NSPR_LIBS) \
|
|
$(NULL)
|
|
endif # WINNT
|
|
ifeq (($OS_ARCH),SunOS)
|
|
DSO_LDOPTS += \
|
|
-L$(JAVAHOME)/jre/lib/sparc \
|
|
-L$(JAVAHOME)/jre/lib/sparc/classic \
|
|
-L$(JAVAHOME)/jre/lib/sparc/native_threads \
|
|
-R$(JAVAHOME)/jre/lib/sparc \
|
|
-R$(JAVAHOME)/jre/lib/sparc/classic \
|
|
-R$(JAVAHOME)/jre/lib/sparc/native_threads \
|
|
-ljvm -lhpi -lthread
|
|
endif
|
|
|
|
include $(topsrcdir)/config/rules.mk
|
|
CCC += $(CXXFLAGS)
|
|
|
|
|
|
|
|
|