3d7dee72f2
Author: Ron Capelli <capelli@acm.org> The following files are updated to allow use of IBM Java 1.3.x JVMs on Linux. Instead of statically linking libjawt.lib, the code now dynamically links libjawt.so and then libawt.so only if needed (similar to previous change for win32). It should work on Solaris, but we couldn't test that here. mozilla/java/webclient/src_moz/Makefile.in mozilla/java/webclient/src_moz/gtk/GtkBrowserControlCanvas.cpp The following files are changed to support the ant 'clean' target for src_ie. mozilla/java/webclient/build.xml mozilla/java/webclient/src_ie/Makefile.in The following files are changed to disable the CurrentPage(2) interface for IE, since it will be a while before that can be made to work. With these changes, IE embeds smoothly with Navigation and History interfaces working nicely to some degree. mozilla/java/webclient/src_ie/WrapperFactoryImpl.cpp mozilla/java/webclient/classes_spec/org/mozilla/webclient/test/EMWindow.java The following file is changed so that it does not depend on Mozilla, allowing it to be shared cleanly for IE. mozilla/java/webclient/src_moz/win32/Win32BrowserControlCanvas.cpp The following file is changed to correct the list of makefiles that need to be configured for Webclient. mozilla/java/makefiles Finally, please delete the following files from CVS. mozilla/java/webclient/src_ie/build.xml mozilla/java/webclient/src_ie/Makefile.win git-svn-id: svn://10.0.0.236/trunk@142382 18797224-902f-48f8-a5cc-f745e15eee43
70 lines
1.6 KiB
Makefile
70 lines
1.6 KiB
Makefile
# The contents of this file are subject to the Mozilla 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/MPL/
|
|
#
|
|
# 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 Sun Microsystems,
|
|
# Inc. Portions created by Sun are
|
|
# Copyright (C) 1999 Sun Microsystems, Inc. All
|
|
# Rights Reserved.
|
|
#
|
|
# Contributor(s): Ron Capelli <capelli@us.ibm.com>
|
|
|
|
DEPTH = ../../..
|
|
topsrcdir = $(DEPTH)
|
|
srcdir = $(topsrcdir)/java/webclient/src_ie
|
|
VPATH = $(topsrcdir)/java/webclient/src_ie
|
|
|
|
|
|
include $(DEPTH)/config/autoconf.mk
|
|
|
|
|
|
ifneq ($(BAL_INTERFACE),)
|
|
LIBRARY_NAME = webclient_bal
|
|
else
|
|
LIBRARY_NAME = webclient
|
|
endif
|
|
|
|
|
|
CPPSRCS = \
|
|
ie_util.cpp \
|
|
ie_util_export.cpp \
|
|
BookmarksImpl.cpp \
|
|
CMyDialog.cpp \
|
|
HistoryImpl.cpp \
|
|
CurrentPageImpl.cpp \
|
|
ISupportsPeer.cpp \
|
|
NativeEventThread.cpp \
|
|
NavigationImpl.cpp \
|
|
WindowControlImpl.cpp \
|
|
WrapperFactoryImpl.cpp \
|
|
$(NULL)
|
|
|
|
CPPSRCS += \
|
|
../src_moz/win32/Win32BrowserControlCanvas.cpp \
|
|
$(NULL)
|
|
|
|
EXTRA_LIBS = $(DIST)/lib/wc_share.lib
|
|
|
|
# Do not copy modules to mozilla/dist
|
|
NO_DIST_INSTALL = 1
|
|
|
|
include $(topsrcdir)/config/rules.mk
|
|
|
|
# Overrides eliminate dependencies on Mozilla
|
|
|
|
INCLUDES = -I$(MOZ_JDKHOME)/include -I$(MOZ_JDKHOME)/include/win32 \
|
|
-I../src_share -I.
|
|
DEFINES =
|
|
OS_COMPILE_CXXFLAGS =
|
|
|
|
|
|
clobber_all:: clobber
|