From 88b23adbf4dbde25f0859f028f7131806f79f4a1 Mon Sep 17 00:00:00 2001 From: "seawood%netscape.com" Date: Sun, 9 Dec 2001 07:05:12 +0000 Subject: [PATCH] Add win32 support to xpcom Makefile.ins Bug #58981 r=bryner git-svn-id: svn://10.0.0.236/trunk@110113 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/xpcom/Makefile.in | 20 +++++- mozilla/xpcom/base/Makefile.in | 13 +++- mozilla/xpcom/build/Makefile.in | 61 +++++++++++++------ mozilla/xpcom/components/Makefile.in | 3 + mozilla/xpcom/ds/Makefile.in | 3 + mozilla/xpcom/glue/Makefile.in | 5 +- mozilla/xpcom/io/Makefile.in | 15 ++++- mozilla/xpcom/proxy/public/Makefile.in | 2 - mozilla/xpcom/proxy/src/Makefile.in | 3 + .../xpcom/reflect/xptcall/public/Makefile.in | 2 - mozilla/xpcom/reflect/xptcall/src/Makefile.in | 4 ++ .../xpcom/reflect/xptcall/src/md/Makefile.in | 6 +- .../reflect/xptcall/src/md/win32/Makefile.in | 60 ++++++++++++++++++ .../xpcom/reflect/xptcall/tests/Makefile.in | 7 ++- mozilla/xpcom/reflect/xptinfo/src/Makefile.in | 3 + .../xpcom/reflect/xptinfo/tests/Makefile.in | 4 ++ mozilla/xpcom/tests/Makefile.in | 15 ++++- mozilla/xpcom/threads/Makefile.in | 3 + mozilla/xpcom/tools/Makefile.in | 4 ++ mozilla/xpcom/tools/registry/Makefile.in | 2 +- mozilla/xpcom/tools/windows/Makefile.in | 36 +++++++++++ mozilla/xpcom/typelib/xpidl/Makefile.in | 12 +++- mozilla/xpcom/typelib/xpt/src/Makefile.in | 5 +- mozilla/xpcom/typelib/xpt/tests/Makefile.in | 4 ++ mozilla/xpcom/typelib/xpt/tools/Makefile.in | 9 ++- mozilla/xpcom/windbgdlg/Makefile.in | 34 +++++++++++ 26 files changed, 292 insertions(+), 43 deletions(-) create mode 100644 mozilla/xpcom/reflect/xptcall/src/md/win32/Makefile.in create mode 100644 mozilla/xpcom/tools/windows/Makefile.in create mode 100644 mozilla/xpcom/windbgdlg/Makefile.in diff --git a/mozilla/xpcom/Makefile.in b/mozilla/xpcom/Makefile.in index 480b1c88976..97e1048d0dd 100644 --- a/mozilla/xpcom/Makefile.in +++ b/mozilla/xpcom/Makefile.in @@ -26,7 +26,25 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -DIRS = typelib glue base ds io components threads reflect proxy build tools +DIRS = \ + typelib \ + glue \ + base \ + ds \ + io \ + components \ + threads \ + reflect \ + proxy \ + build \ + tools \ + $(NULL) + +ifeq ($(OS_ARCH),WINNT) +ifdef MOZ_DEBUG +DIRS += windbgdlg +endif +endif ifdef ENABLE_TESTS DIRS += \ diff --git a/mozilla/xpcom/base/Makefile.in b/mozilla/xpcom/base/Makefile.in index 75253db42a8..6347286ac11 100644 --- a/mozilla/xpcom/base/Makefile.in +++ b/mozilla/xpcom/base/Makefile.in @@ -84,6 +84,13 @@ EXPORTS += nsTraceMalloc.h DEFINES += -DNS_TRACE_MALLOC endif +ifeq ($(OS_ARCH),WINNT) +ifdef MOZ_DEBUG +CSRCS += pure_api.c +EXPORTS += pure.h +endif +endif + XPIDLSRCS = \ nsrootidl.idl \ nsISupports.idl \ @@ -103,8 +110,6 @@ ifdef GC_LEAK_DETECTOR XPIDLSRCS += nsILeakDetector.idl endif -EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS)) - # we don't want the shared lib, but we want to force the creation of a static lib. FORCE_STATIC_LIB = 1 @@ -118,3 +123,7 @@ DEFINES += -D_IMPL_NS_COM ifeq ($(OS_ARCH), Linux) DEFINES += -D_BSD_SOURCE endif + +ifeq ($(OS_ARCH), WINNT) +DEFINES += -DWIN32_LEAN_AND_MEAN +endif diff --git a/mozilla/xpcom/build/Makefile.in b/mozilla/xpcom/build/Makefile.in index 08003430fe0..580f3ee0b3b 100644 --- a/mozilla/xpcom/build/Makefile.in +++ b/mozilla/xpcom/build/Makefile.in @@ -44,25 +44,33 @@ endif CPPSRCS = nsXPComInit.cpp +ifeq ($(OS_ARCH),WINNT) +CPPSRCS += dlldeps.cpp +endif + ifdef XPCOM_USE_LEA CSRCS += malloc.c endif +ifdef GC_LEAK_DETECTOR +EXTRA_DSO_LIBS = boehm +endif + SHARED_LIBRARY_LIBS = \ - $(DIST)/lib/libxpcomds_s.$(LIB_SUFFIX) \ - $(DIST)/lib/libxpcomio_s.$(LIB_SUFFIX) \ - $(DIST)/lib/libxpcomcomponents_s.$(LIB_SUFFIX) \ - $(DIST)/lib/libxpcomthreads_s.$(LIB_SUFFIX) \ - $(DIST)/lib/libxpcomproxy_s.$(LIB_SUFFIX) \ - $(DIST)/lib/libxpcombase_s.$(LIB_SUFFIX) \ - $(DIST)/lib/libxptcall.$(LIB_SUFFIX) \ - $(DIST)/lib/libxptinfo.$(LIB_SUFFIX) \ - $(DIST)/lib/libxpt.$(LIB_SUFFIX) \ - $(DIST)/lib/libxptcmd.$(LIB_SUFFIX) \ - $(DIST)/lib/libmozreg_s.$(LIB_SUFFIX) \ - $(DIST)/lib/libstring_s.$(LIB_SUFFIX) \ - $(DIST)/lib/libstring_obsolete_s.$(LIB_SUFFIX) \ - $(DIST)/lib/libxpcomglue.$(LIB_SUFFIX) \ + $(DIST)/lib/$(LIB_PREFIX)xpcomds_s.$(LIB_SUFFIX) \ + $(DIST)/lib/$(LIB_PREFIX)xpcomio_s.$(LIB_SUFFIX) \ + $(DIST)/lib/$(LIB_PREFIX)xpcomcomponents_s.$(LIB_SUFFIX) \ + $(DIST)/lib/$(LIB_PREFIX)xpcomthreads_s.$(LIB_SUFFIX) \ + $(DIST)/lib/$(LIB_PREFIX)xpcomproxy_s.$(LIB_SUFFIX) \ + $(DIST)/lib/$(LIB_PREFIX)xpcombase_s.$(LIB_SUFFIX) \ + $(DIST)/lib/$(LIB_PREFIX)xptcall.$(LIB_SUFFIX) \ + $(DIST)/lib/$(LIB_PREFIX)xptinfo.$(LIB_SUFFIX) \ + $(DIST)/lib/$(LIB_PREFIX)xpt.$(LIB_SUFFIX) \ + $(DIST)/lib/$(LIB_PREFIX)xptcmd.$(LIB_SUFFIX) \ + $(DIST)/lib/$(LIB_PREFIX)mozreg_s.$(LIB_SUFFIX) \ + $(DIST)/lib/$(LIB_PREFIX)string_s.$(LIB_SUFFIX) \ + $(DIST)/lib/$(LIB_PREFIX)string_obsolete_s.$(LIB_SUFFIX) \ + $(DIST)/lib/$(LIB_PREFIX)xpcomglue.$(LIB_SUFFIX) \ $(NULL) LOCAL_INCLUDES = \ @@ -80,10 +88,6 @@ ifdef MOZ_DEMANGLE_SYMBOLS EXTRA_DSO_LDOPTS += -liberty endif -ifdef GC_LEAK_DETECTOR -EXTRA_DSO_LDOPTS += -lboehm -endif - # pull in MoreFiles for MacOSX ifeq ($(MOZ_WIDGET_TOOLKIT),mac) EXTRA_DSO_LDOPTS += $(DEPTH)/dist/lib/libmacmorefiles_s.a @@ -101,7 +105,18 @@ FORCE_SHARED_LIB = 1 include $(topsrcdir)/config/rules.mk -DEFINES += -D_IMPL_NS_COM -D_IMPL_NS_BASE +DEFINES += \ + -D_IMPL_NS_COM \ + -D_IMPL_NS_BASE \ + -DEXPORT_XPT_API \ + -DEXPORT_XPTC_API \ + -DEXPORT_XPTI_API + +EXTRA_DSO_LDOPTS += $(NSPR_LIBS) + +ifdef GC_LEAK_DETECTOR +DEFINES += -DGC_LEAK_DETECTOR +endif ifeq ($(MOZ_WIDGET_TOOLKIT),mac) CXXFLAGS += $(TK_CFLAGS) @@ -112,5 +127,11 @@ ifeq ($(OS_ARCH),BeOS) EXTRA_DSO_LDOPTS += -lbe endif -EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_NSPR_LIBS) +ifeq ($(OS_ARCH),WINNT) +DEFINES += -DWIN32_LEAN_AND_MEAN +EXTRA_DSO_LDOPTS += shell32.lib ole32.lib +ifneq (,$(MOZ_DEBUG)$(MOZ_TRACE_MALLOC)) +EXTRA_DSO_LDOPTS += imagehlp.lib +endif +endif # WINNT diff --git a/mozilla/xpcom/components/Makefile.in b/mozilla/xpcom/components/Makefile.in index 9faf1c9ea3f..bd458a09a60 100644 --- a/mozilla/xpcom/components/Makefile.in +++ b/mozilla/xpcom/components/Makefile.in @@ -84,3 +84,6 @@ FORCE_USE_PIC = 1 include $(topsrcdir)/config/rules.mk DEFINES += -DUSE_NSREG -D_IMPL_NS_COM -D_IMPL_NS_BASE +ifeq ($(OS_ARCH), WINNT) +DEFINES += -DWIN32_LEAN_AND_MEAN +endif diff --git a/mozilla/xpcom/ds/Makefile.in b/mozilla/xpcom/ds/Makefile.in index 379a1d215e2..b36b729c63b 100644 --- a/mozilla/xpcom/ds/Makefile.in +++ b/mozilla/xpcom/ds/Makefile.in @@ -135,3 +135,6 @@ include $(topsrcdir)/config/rules.mk DEFINES += -D_IMPL_NS_COM -D_IMPL_NS_BASE +ifeq ($(OS_ARCH),WINNT) +DEFINES += -DWIN32_LEAN_AND_MEAN +endif diff --git a/mozilla/xpcom/glue/Makefile.in b/mozilla/xpcom/glue/Makefile.in index b95e6b29246..de8ece9b72a 100644 --- a/mozilla/xpcom/glue/Makefile.in +++ b/mozilla/xpcom/glue/Makefile.in @@ -57,5 +57,8 @@ FORCE_USE_PIC = 1 include $(topsrcdir)/config/rules.mk -DEFINES += -D_IMPL_NS_COM +DEFINES += -D_IMPL_NS_COM -D_IMPL_NS_BASE +ifeq ($(OS_ARCH),WINNT) +DEFINES += -DWIN32_LEAN_AND_MEAN +endif diff --git a/mozilla/xpcom/io/Makefile.in b/mozilla/xpcom/io/Makefile.in index ddbe9a7cc5a..7bdb5d20870 100644 --- a/mozilla/xpcom/io/Makefile.in +++ b/mozilla/xpcom/io/Makefile.in @@ -67,9 +67,13 @@ CPPSRCS += nsLocalFileOS2.cpp #CPPSRCS += nsLocalFileMac.cpp #CSRCS += macDirectoryCopy.c else +ifeq ($(MOZ_WIDGET_TOOLKIT),windows) +CPPSRCS += nsLocalFileWin.cpp +else CPPSRCS += nsLocalFileUnix.cpp -endif +endif # windows #endif +endif # OS2 EXPORTS = \ nsAppDirectoryServiceDefs.h \ @@ -97,9 +101,13 @@ else #ifeq ($(MOZ_WIDGET_TOOLKIT),mac) #EXPORTS += nsLocalFileMac.h nsILocalFileMac.h #else +ifeq ($(MOZ_WIDGET_TOOLKIT),windows) +EXPORTS += nsLocalFileWin.h +else EXPORTS += nsLocalFileUnix.h -endif +endif # windows #endif +endif # os2 XPIDLSRCS = \ nsIBinaryInputStream.idl \ @@ -140,4 +148,7 @@ DEFINES += -D_IMPL_NS_COM -D_IMPL_NS_BASE ifeq ($(OS_ARCH), Linux) DEFINES += -D_BSD_SOURCE endif +ifeq ($(OS_ARCH),WINNT) +DEFINES += -DWIN32_LEAN_AND_MEAN +endif diff --git a/mozilla/xpcom/proxy/public/Makefile.in b/mozilla/xpcom/proxy/public/Makefile.in index a5b435b3089..d439de3a0eb 100644 --- a/mozilla/xpcom/proxy/public/Makefile.in +++ b/mozilla/xpcom/proxy/public/Makefile.in @@ -38,7 +38,5 @@ XPIDLSRCS = nsIProxyCreateInstance.idl \ nsIProxyObjectManager.idl \ $(NULL) -EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS)) - include $(topsrcdir)/config/rules.mk diff --git a/mozilla/xpcom/proxy/src/Makefile.in b/mozilla/xpcom/proxy/src/Makefile.in index cb6f9a1e4a2..2cf49cad3d6 100644 --- a/mozilla/xpcom/proxy/src/Makefile.in +++ b/mozilla/xpcom/proxy/src/Makefile.in @@ -49,3 +49,6 @@ FORCE_USE_PIC = 1 include $(topsrcdir)/config/rules.mk +ifeq ($(OS_ARCH),WINNT) +DEFINES += -DWIN32_LEAN_AND_MEAN +endif diff --git a/mozilla/xpcom/reflect/xptcall/public/Makefile.in b/mozilla/xpcom/reflect/xptcall/public/Makefile.in index d8594882899..de05e2843bc 100644 --- a/mozilla/xpcom/reflect/xptcall/public/Makefile.in +++ b/mozilla/xpcom/reflect/xptcall/public/Makefile.in @@ -34,7 +34,5 @@ EXPORTS = \ xptcstubsdef.inc \ $(NULL) -EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS)) - include $(topsrcdir)/config/rules.mk diff --git a/mozilla/xpcom/reflect/xptcall/src/Makefile.in b/mozilla/xpcom/reflect/xptcall/src/Makefile.in index 6a5f784bac4..40b6f1a7ab0 100644 --- a/mozilla/xpcom/reflect/xptcall/src/Makefile.in +++ b/mozilla/xpcom/reflect/xptcall/src/Makefile.in @@ -44,3 +44,7 @@ include $(topsrcdir)/config/rules.mk DEFINES += -DEXPORT_XPTC_API +ifeq ($(OS_ARCH),WINNT) +DEFINES += -DWIN32_LEAN_AND_MEAN +endif + diff --git a/mozilla/xpcom/reflect/xptcall/src/md/Makefile.in b/mozilla/xpcom/reflect/xptcall/src/md/Makefile.in index b0525743cc0..5fa4b90ffcf 100644 --- a/mozilla/xpcom/reflect/xptcall/src/md/Makefile.in +++ b/mozilla/xpcom/reflect/xptcall/src/md/Makefile.in @@ -29,8 +29,12 @@ include $(DEPTH)/config/autoconf.mk ifeq ($(MOZ_WIDGET_TOOLKIT),os2) DIRS = os2 else +ifeq ($(MOZ_WIDGET_TOOLKIT),windows) +DIRS = win32 +else DIRS = unix endif - +endif + include $(topsrcdir)/config/rules.mk diff --git a/mozilla/xpcom/reflect/xptcall/src/md/win32/Makefile.in b/mozilla/xpcom/reflect/xptcall/src/md/win32/Makefile.in new file mode 100644 index 00000000000..2e6804dc0f6 --- /dev/null +++ b/mozilla/xpcom/reflect/xptcall/src/md/win32/Makefile.in @@ -0,0 +1,60 @@ +# +# 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 + +MODULE = xpcom +LIBRARY_NAME = xptcmd + +# +# The default is this buildable, but non-functioning code. +# +CPPSRCS := xptcinvoke.cpp xptcstubs.cpp + +# Force use of PIC +FORCE_USE_PIC = 1 + +include $(topsrcdir)/config/config.mk + +ifeq ($(CPU),ALPHA) +CPPSRCS := xptcinvoke_alpha.cpp xptcstubs_alpha.cpp +ASFILES := xptcinvoke_asm_alpha.s xptcstubs_asm_alpha.s +AS := asaxp +ASFLAGS += /I../../..public +endif + +# we don't want the shared lib, but we want to force the creation of a static lib. +FORCE_STATIC_LIB = 1 + +include $(topsrcdir)/config/rules.mk + +DEFINES += -DEXPORT_XPTC_API + +LOCAL_INCLUDES = -I$(srcdir)/../.. + +ifeq ($(OS_ARCH),WINNT) +DEFINES += -DWIN32_LEAN_AND_MEAN +endif diff --git a/mozilla/xpcom/reflect/xptcall/tests/Makefile.in b/mozilla/xpcom/reflect/xptcall/tests/Makefile.in index efe8f357522..de55cd28a12 100644 --- a/mozilla/xpcom/reflect/xptcall/tests/Makefile.in +++ b/mozilla/xpcom/reflect/xptcall/tests/Makefile.in @@ -40,10 +40,15 @@ LIBS = \ include $(topsrcdir)/config/rules.mk -CFLAGS += -DJS_THREADSAFE +DEFINES += -DUSE_NSREG # For _write(). ifeq ($(OS_ARCH),BSD_OS) OS_LIBS += -lgcc endif +ifeq ($(OS_ARCH),WINNT) +DEFINES += -DWIN32_LEAN_AND_MEAN +endif + + diff --git a/mozilla/xpcom/reflect/xptinfo/src/Makefile.in b/mozilla/xpcom/reflect/xptinfo/src/Makefile.in index cb9f8eb14db..16c5a639038 100644 --- a/mozilla/xpcom/reflect/xptinfo/src/Makefile.in +++ b/mozilla/xpcom/reflect/xptinfo/src/Makefile.in @@ -53,3 +53,6 @@ FORCE_USE_PIC = 1 include $(topsrcdir)/config/rules.mk DEFINES += -DEXPORT_XPTI_API -DEXPORT_XPT_API +ifeq ($(OS_ARCH), WINNT) +DEFINES += -DWIN32_LEAN_AND_MEAN +endif diff --git a/mozilla/xpcom/reflect/xptinfo/tests/Makefile.in b/mozilla/xpcom/reflect/xptinfo/tests/Makefile.in index c843e561e15..35fd295fd96 100644 --- a/mozilla/xpcom/reflect/xptinfo/tests/Makefile.in +++ b/mozilla/xpcom/reflect/xptinfo/tests/Makefile.in @@ -39,3 +39,7 @@ LIBS = \ include $(topsrcdir)/config/rules.mk +DEFINES += -DUSE_NSREG -DEXPORT_XPTI_API +ifeq ($(OS_ARCH), WINNT) +DEFINES += -DWIN32_LEAN_AND_MEAN +endif diff --git a/mozilla/xpcom/tests/Makefile.in b/mozilla/xpcom/tests/Makefile.in index 3b236c4092c..fc694b50a79 100644 --- a/mozilla/xpcom/tests/Makefile.in +++ b/mozilla/xpcom/tests/Makefile.in @@ -28,6 +28,10 @@ include $(DEPTH)/config/autoconf.mk MODULE = xpcom DIRS = dynamic services +ifeq ($(OS_ARCH),WINNT) +DIRS += windows +endif + REQUIRES = necko \ string \ uconv \ @@ -37,6 +41,7 @@ CPPSRCS = \ FilesTest.cpp \ nsIFileEnumerator.cpp \ nsIFileTest.cpp \ + PropertiesTest.cpp \ TestArray.cpp \ TestAtoms.cpp \ TestAutoLock.cpp \ @@ -55,6 +60,8 @@ CPPSRCS = \ TestXPIDLString.cpp \ $(NULL) +#CPPSRCS += TimerTest.cpp + SIMPLE_PROGRAMS = $(CPPSRCS:.cpp=$(BIN_SUFFIX)) include $(topsrcdir)/config/config.mk @@ -67,9 +74,7 @@ CPPSRCS += \ endif LIBS += \ - $(MOZ_JS_LIBS) \ $(XPCOM_LIBS) \ - $(TK_LIBS) \ $(NSPR_LIBS) \ $(NULL) @@ -81,11 +86,15 @@ endif include $(topsrcdir)/config/rules.mk DEFINES += -DUSE_NSREG -INCLUDES += \ +LOCAL_INCLUDES = \ -I$(srcdir)/../ds \ -I$(srcdir)/services \ $(NULL) +ifeq ($(OS_ARCH),WINNT) +CXXFLAGS += -GX +endif + libs:: $(INSTALL) $(srcdir)/test.properties $(DIST)/bin/res diff --git a/mozilla/xpcom/threads/Makefile.in b/mozilla/xpcom/threads/Makefile.in index 438a71f1f6d..b622d6a1a99 100644 --- a/mozilla/xpcom/threads/Makefile.in +++ b/mozilla/xpcom/threads/Makefile.in @@ -73,4 +73,7 @@ FORCE_USE_PIC = 1 include $(topsrcdir)/config/rules.mk DEFINES += -D_IMPL_NS_COM -D_IMPL_NS_BASE +ifeq ($(OS_ARCH), WINNT) +DEFINES += -DWIN32_LEAN_AND_MEAN +endif diff --git a/mozilla/xpcom/tools/Makefile.in b/mozilla/xpcom/tools/Makefile.in index ce44f41369c..c6c18ccd294 100644 --- a/mozilla/xpcom/tools/Makefile.in +++ b/mozilla/xpcom/tools/Makefile.in @@ -28,5 +28,9 @@ include $(DEPTH)/config/autoconf.mk DIRS = registry +ifeq ($(OS_ARCH),WINNT) +DIRS += windows +endif + include $(topsrcdir)/config/rules.mk diff --git a/mozilla/xpcom/tools/registry/Makefile.in b/mozilla/xpcom/tools/registry/Makefile.in index 6e9fbc0b595..8925ec336cc 100644 --- a/mozilla/xpcom/tools/registry/Makefile.in +++ b/mozilla/xpcom/tools/registry/Makefile.in @@ -33,8 +33,8 @@ REQUIRES = $(NULL) SIMPLE_PROGRAMS = $(CPPSRCS:.cpp=$(BIN_SUFFIX)) LIBS = \ - $(MOZ_COMPONENT_LIBS) \ $(XPCOM_LIBS) \ + $(NSPR_LIBS) \ $(NULL) include $(topsrcdir)/config/rules.mk diff --git a/mozilla/xpcom/tools/windows/Makefile.in b/mozilla/xpcom/tools/windows/Makefile.in new file mode 100644 index 00000000000..06b699d6c5c --- /dev/null +++ b/mozilla/xpcom/tools/windows/Makefile.in @@ -0,0 +1,36 @@ +# +# 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 + +SIMPLE_PROGRAMS = rebasedlls$(BIN_SUFFIX) + +CPPSRCS = rebasedlls.cpp + +OS_LIBS += imagehlp.lib + +include $(topsrcdir)/config/rules.mk + diff --git a/mozilla/xpcom/typelib/xpidl/Makefile.in b/mozilla/xpcom/typelib/xpidl/Makefile.in index a95f2f42328..49d36c56ce0 100644 --- a/mozilla/xpcom/typelib/xpidl/Makefile.in +++ b/mozilla/xpcom/typelib/xpidl/Makefile.in @@ -30,6 +30,9 @@ MODULE = xpcom PROGRAM = xpidl$(BIN_SUFFIX) INTERNAL_TOOLS = 1 +# glib and libIDL link against the non-debug msvcrt +MOZ_NO_DEBUG_RTL=1 + CSRCS = \ xpidl.c \ xpidl_idl.c \ @@ -52,10 +55,14 @@ CFLAGS += $(LIBIDL_CFLAGS) # Compile directly against the static lib, so we can use xpidl during the build # without the shared library path being set. -LIBS = $(DIST)/lib/libxpt.$(LIB_SUFFIX) $(LIBIDL_LIBS) +ifeq (_WINNT,$(GNU_CC)_$(OS_ARCH)) +DEFINES += -DEXPORT_XPT_API +LDFLAGS += -SUBSYSTEM:CONSOLE -NODEFAULTLIB:MSVCRTD +endif # Tell the $(PROGRAM) target that we need to be recompiled when libxpt changes. -EXTRA_DEPS = $(wildcard $(DIST)/lib/libxpt.*) +LIBS = $(DIST)/lib/$(LIB_PREFIX)xpt.$(LIB_SUFFIX) $(LIBIDL_LIBS) +EXTRA_DEPS = $(wildcard $(DIST)/lib/$(LIB_PREFIX)xpt.*) ifdef CROSS_COMPILE HOST_CFLAGS += $(HOST_LIBIDL_CFLAGS) @@ -68,4 +75,3 @@ endif endif export:: libs - diff --git a/mozilla/xpcom/typelib/xpt/src/Makefile.in b/mozilla/xpcom/typelib/xpt/src/Makefile.in index fc2eac3c828..4accdb2a393 100644 --- a/mozilla/xpcom/typelib/xpt/src/Makefile.in +++ b/mozilla/xpcom/typelib/xpt/src/Makefile.in @@ -33,7 +33,6 @@ ifdef CROSS_COMPILE HOST_LIBRARY_NAME = hostxpt endif - CSRCS = xpt_arena.c xpt_struct.c xpt_xdr.c HOST_CSRCS = $(CSRCS) @@ -48,6 +47,10 @@ include $(topsrcdir)/config/rules.mk DEFINES += -DEXPORT_XPT_API HOST_CFLAGS += -DEXPORT_XPT_API +ifeq ($(OS_ARCH),WINNT) +DEFINES += -DWIN32_LEAN_AND_MEAN +endif + # Build libxpt early so that it'll be available to xpidl, which also # must be built early. export:: libs diff --git a/mozilla/xpcom/typelib/xpt/tests/Makefile.in b/mozilla/xpcom/typelib/xpt/tests/Makefile.in index f35f6163d07..a748ef04d09 100644 --- a/mozilla/xpcom/typelib/xpt/tests/Makefile.in +++ b/mozilla/xpcom/typelib/xpt/tests/Makefile.in @@ -40,3 +40,7 @@ LIBS = \ include $(topsrcdir)/config/rules.mk +DEFINES += -DEXPORT_XPT_API -DUSE_NSREG +ifeq ($(OS_ARCH),WINNT) +DEFINES += -DWIN32_LEAN_AND_MEAN +endif diff --git a/mozilla/xpcom/typelib/xpt/tools/Makefile.in b/mozilla/xpcom/typelib/xpt/tools/Makefile.in index dab7cc897d1..d1e6b95c9a5 100644 --- a/mozilla/xpcom/typelib/xpt/tools/Makefile.in +++ b/mozilla/xpcom/typelib/xpt/tools/Makefile.in @@ -42,12 +42,15 @@ include $(topsrcdir)/config/rules.mk # Compile directly against the static lib, so we can use the tools # during the build without the shared library path being set. -LIBS = $(DIST)/lib/libxpt.$(LIB_SUFFIX) +ifeq ($(OS_ARCH),WINNT) +DEFINES += -DUSE_NSREG -DWIN32_LEAN_AND_MEAN -DEXPORT_XPT_API +endif + +LIBS = $(DIST)/lib/$(LIB_PREFIX)xpt.$(LIB_SUFFIX) # Tell the $(SIMPLE_PROGRAMS) target that we need to be recompiled # when libxpt changes. -EXTRA_DEPS = $(wildcard $(DIST)/lib/libxpt.*) - +EXTRA_DEPS = $(wildcard $(DIST)/lib/$(LIB_PREFIX)xpt.*) ifdef CROSS_COMPILE HOST_LIBS = $(DIST)/host/lib/libhostxpt.$(LIB_SUFFIX) diff --git a/mozilla/xpcom/windbgdlg/Makefile.in b/mozilla/xpcom/windbgdlg/Makefile.in new file mode 100644 index 00000000000..a8f7cff8d1e --- /dev/null +++ b/mozilla/xpcom/windbgdlg/Makefile.in @@ -0,0 +1,34 @@ +# +# 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 + +SIMPLE_PROGRAMS = windbgdlg$(BIN_SUFFIX) + +CPPSRCS = windbgdlg.cpp + +include $(topsrcdir)/config/rules.mk +