зеркало из https://github.com/mozilla/pjs.git
Align mingw libs linkage with msvc.
Thanks to Masatoshi Kimura (emk) <VYV03354@nifty.ne.jp> for the patch. Bug #334542 r=cls
This commit is contained in:
cls%seawood.org
Родитель
403ecd7f4e
Коммит
9d3fb5f3b1
|
|
@ -168,7 +168,7 @@ EXTRA_LIBS += $(STATIC_EXTRA_LIBS)
|
|||
endif
|
||||
|
||||
ifeq ($(OS_ARCH),WINNT)
|
||||
OS_LIBS += $(call EXPAND_LIBNAME,comctl32 comdlg32 uuid shell32 ole32 oleaut32 version winspool gdi32 imm32 winmm)
|
||||
OS_LIBS += $(call EXPAND_LIBNAME,comctl32 comdlg32 uuid shell32 ole32 oleaut32 version winspool)
|
||||
ifdef MOZ_ENABLE_CAIRO_GFX
|
||||
OS_LIBS += $(call EXPAND_LIBNAME,usp10)
|
||||
endif
|
||||
|
|
|
|||
|
|
@ -135,7 +135,7 @@ EXTRA_LIBS += $(STATIC_EXTRA_LIBS)
|
|||
endif
|
||||
|
||||
ifeq ($(OS_ARCH),WINNT)
|
||||
OS_LIBS += $(call EXPAND_LIBNAME,comctl32 comdlg32 uuid shell32 ole32 oleaut32 version winspool gdi32 imm32 winmm)
|
||||
OS_LIBS += $(call EXPAND_LIBNAME,comctl32 comdlg32 uuid shell32 ole32 oleaut32 version winspool)
|
||||
ifdef MOZ_ENABLE_CAIRO_GFX
|
||||
OS_LIBS += $(call EXPAND_LIBNAME,usp10)
|
||||
endif
|
||||
|
|
|
|||
|
|
@ -124,9 +124,10 @@ STATIC_EXTRA_LIBS += $(MOZ_XPCOM_OBSOLETE_LIBS)
|
|||
endif
|
||||
|
||||
ifeq ($(OS_ARCH),WINNT)
|
||||
STATIC_EXTRA_LIBS += $(call EXPAND_LIBNAME,comctl32 comdlg32 uuid shell32 ole32 oleaut32 version winspool imm32 winmm)
|
||||
STATIC_EXTRA_LIBS += $(call EXPAND_LIBNAME,comctl32 comdlg32 uuid shell32 ole32 oleaut32 version winspool imm32)
|
||||
# XXX temporary workaround until link ordering issue is solved
|
||||
ifdef GNU_CC
|
||||
STATIC_EXTRA_LIBS += $(call EXPAND_LIBNAME, wsock32 gdi32)
|
||||
STATIC_EXTRA_LIBS += $(call EXPAND_LIBNAME,winmm wsock32 gdi32)
|
||||
endif
|
||||
ifdef MOZ_ENABLE_CAIRO_GFX
|
||||
STATIC_EXTRA_LIBS += $(call EXPAND_LIBNAME, usp10)
|
||||
|
|
|
|||
Разница между файлами не показана из-за своего большого размера
Загрузить разницу
|
|
@ -1723,6 +1723,8 @@ case "$target" in
|
|||
RC='$(WINDRES)'
|
||||
# Use temp file for windres (bug 213281)
|
||||
RCFLAGS='-O coff --use-temp-file'
|
||||
# mingw doesn't require kernel32, user32, and advapi32 explicitly
|
||||
LIBS="$LIBS -lgdi32 -lwinmm -lwsock32"
|
||||
MOZ_JPEG_LIBS='-L$(LIBXUL_DIST)/lib -ljpeg$(MOZ_BITS)$(VERSION_NUMBER)'
|
||||
MOZ_ZLIB_LIBS='-L$(LIBXUL_DIST)/lib -lmozz'
|
||||
MOZ_PNG_LIBS='-L$(LIBXUL_DIST)/lib -lpng'
|
||||
|
|
@ -6957,10 +6959,6 @@ if test "$MOZ_SVG" -o "$MOZ_ENABLE_CANVAS" -o "$MOZ_ENABLE_CAIRO_GFX" ; then
|
|||
MOZ_CAIRO_LIBS="$MOZ_CAIRO_LIBS -lmozglitzwgl"
|
||||
fi
|
||||
fi
|
||||
|
||||
if test "$MOZ_WIDGET_TOOLKIT" = "windows"; then
|
||||
MOZ_CAIRO_LIBS="$MOZ_CAIRO_LIBS -lgdi32"
|
||||
fi
|
||||
fi
|
||||
else
|
||||
PKG_CHECK_MODULES(CAIRO, cairo >= $CAIRO_VERSION freetype2 fontconfig)
|
||||
|
|
|
|||
|
|
@ -105,9 +105,6 @@ CPPSRCS += nsSystemFontsWin.cpp \
|
|||
REQUIRES += glitzwgl
|
||||
|
||||
_OS_LIBS = usp10
|
||||
ifdef GNU_CXX
|
||||
_OS_LIBS += gdi32
|
||||
endif
|
||||
OS_LIBS += $(call EXPAND_LIBNAME,$(_OS_LIBS))
|
||||
endif
|
||||
|
||||
|
|
|
|||
|
|
@ -1,130 +0,0 @@
|
|||
#
|
||||
# ***** BEGIN LICENSE BLOCK *****
|
||||
# Version: MPL 1.1/GPL 2.0/LGPL 2.1
|
||||
#
|
||||
# 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
|
||||
# Netscape Communications Corporation.
|
||||
# Portions created by the Initial Developer are Copyright (C) 2001
|
||||
# the Initial Developer. All Rights Reserved.
|
||||
#
|
||||
# Contributor(s):
|
||||
#
|
||||
# Alternatively, the contents of this file may be used under the terms of
|
||||
# either of the GNU General Public License Version 2 or later (the "GPL"),
|
||||
# or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
|
||||
# in which case the provisions of the GPL or the LGPL are applicable instead
|
||||
# of those above. If you wish to allow use of your version of this file only
|
||||
# under the terms of either the GPL or the LGPL, and not to allow others to
|
||||
# use your version of this file under the terms of the MPL, indicate your
|
||||
# decision by deleting the provisions above and replace them with the notice
|
||||
# and other provisions required by the GPL or the LGPL. If you do not delete
|
||||
# the provisions above, a recipient may use your version of this file under
|
||||
# the terms of any one of the MPL, the GPL or the LGPL.
|
||||
#
|
||||
# ***** END LICENSE BLOCK *****
|
||||
|
||||
DEPTH = ../../..
|
||||
topsrcdir = @top_srcdir@
|
||||
srcdir = @srcdir@
|
||||
VPATH = @srcdir@
|
||||
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
MODULE = gfxwin
|
||||
LIBRARY_NAME = gkgfxwin
|
||||
EXPORT_LIBRARY = 1
|
||||
IS_COMPONENT = 1
|
||||
MODULE_NAME = nsGfxModule
|
||||
GRE_MODULE = 1
|
||||
LIBXUL_LIBRARY = 1
|
||||
|
||||
REQUIRES = xpcom \
|
||||
string \
|
||||
gfx \
|
||||
widget \
|
||||
intl \
|
||||
view \
|
||||
pref \
|
||||
uconv \
|
||||
unicharutil \
|
||||
locale \
|
||||
necko \
|
||||
content \
|
||||
layout \
|
||||
dom \
|
||||
debug \
|
||||
imglib2 \
|
||||
windowwatcher \
|
||||
$(NULL)
|
||||
|
||||
CPPSRCS = \
|
||||
nsDeviceContextWin.cpp \
|
||||
nsDrawingSurfaceWin.cpp \
|
||||
nsRenderingContextWin.cpp \
|
||||
nsFontMetricsWin.cpp \
|
||||
nsImageWin.cpp \
|
||||
nsRegionWin.cpp \
|
||||
nsGfxFactoryWin.cpp \
|
||||
nsUnicodeRange.cpp \
|
||||
$(NULL)
|
||||
|
||||
EXPORTS = nsIRenderingContextWin.h nsIDrawingSurfaceWin.h
|
||||
|
||||
EXTRA_DSO_LIBS = gkgfx mozutil_s gfxshared_s
|
||||
|
||||
LOCAL_INCLUDES = \
|
||||
-I$(srcdir)/. \
|
||||
-I$(srcdir)/.. \
|
||||
-I$(srcdir)/../shared \
|
||||
$(NULL)
|
||||
|
||||
ifndef WINCE
|
||||
_OS_LIBS = comdlg32
|
||||
endif
|
||||
ifdef GNU_CC
|
||||
_OS_LIBS += gdi32
|
||||
endif
|
||||
OS_LIBS += $(call EXPAND_LIBNAME,$(_OS_LIBS))
|
||||
|
||||
EXTRA_DSO_LDOPTS += \
|
||||
$(LIBS_DIR) \
|
||||
$(EXTRA_DSO_LIBS) \
|
||||
$(MOZ_UNICHARUTIL_LIBS) \
|
||||
$(MOZ_COMPONENT_LIBS) \
|
||||
$(MOZ_JS_LIBS) \
|
||||
$(NULL)
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
libs:: fontEncoding.properties fontNameMap.properties
|
||||
$(INSTALL) $^ $(DIST)/bin/res/fonts
|
||||
|
||||
install:: fontEncoding.properties fontNameMap.properties
|
||||
$(INSTALL) $^ $(DESTDIR)$(mozappdir)/res/fonts
|
||||
|
||||
DEFINES += -DSTRICT
|
||||
|
||||
ifdef NGLAYOUT_DDRAW
|
||||
DEFINES += DNGLAYOUT_DDRAW
|
||||
ifeq ($(MOZ_VCVER),50)
|
||||
LOCAL_INCLUDES += -I$(NGLAYOUT_DDRAW)/include
|
||||
else
|
||||
LOCAL_INCLUDES += -I$(NGLAYOUT_DDRAW)/inc
|
||||
endif
|
||||
EXTRA_DSO_LDOPTS += $(NGLAYOUT_DDRAW)/lib/ddraw.lib
|
||||
OS_LIBS += ole32.lib
|
||||
endif
|
||||
|
||||
|
||||
|
|
@ -52,7 +52,7 @@ CPPSRCS += gfxWindowsFonts.cpp \
|
|||
|
||||
_OS_LIBS = usp10 ole32
|
||||
ifdef GNU_CXX
|
||||
_OS_LIBS += gdi32 uuid
|
||||
_OS_LIBS += uuid
|
||||
endif
|
||||
OS_LIBS += $(call EXPAND_LIBNAME,$(_OS_LIBS))
|
||||
|
||||
|
|
|
|||
|
|
@ -219,12 +219,6 @@ EXTRA_DSO_LDOPTS += $(MOZ_CAIRO_LIBS)
|
|||
endif
|
||||
endif
|
||||
|
||||
ifeq (WINNT,$(OS_ARCH))
|
||||
ifdef GNU_CXX
|
||||
OS_LIBS += $(call EXPAND_LIBNAME,gdi32)
|
||||
endif
|
||||
endif
|
||||
|
||||
ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
|
||||
EXTRA_DSO_LDOPTS += \
|
||||
$(TK_LIBS) \
|
||||
|
|
|
|||
|
|
@ -135,7 +135,7 @@ EXTRA_LIBS += $(STATIC_EXTRA_LIBS)
|
|||
endif
|
||||
|
||||
ifeq ($(OS_ARCH),WINNT)
|
||||
OS_LIBS += $(call EXPAND_LIBNAME,comctl32 comdlg32 uuid shell32 ole32 oleaut32 version winspool gdi32 imm32 winmm)
|
||||
OS_LIBS += $(call EXPAND_LIBNAME,comctl32 comdlg32 uuid shell32 ole32 oleaut32 version winspool)
|
||||
ifdef MOZ_ENABLE_CAIRO_GFX
|
||||
OS_LIBS += $(call EXPAND_LIBNAME,usp10)
|
||||
endif
|
||||
|
|
|
|||
|
|
@ -132,9 +132,6 @@ endif
|
|||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
ifeq ($(OS_ARCH),WINNT)
|
||||
ifdef GNU_CC
|
||||
OS_LIBS += -lwsock32
|
||||
endif
|
||||
OS_LIBS += $(call EXPAND_LIBNAME,ole32 shell32)
|
||||
endif
|
||||
|
||||
|
|
|
|||
|
|
@ -136,7 +136,7 @@ EXTRA_LIBS += $(STATIC_EXTRA_LIBS)
|
|||
endif
|
||||
|
||||
ifeq ($(OS_ARCH),WINNT)
|
||||
OS_LIBS += $(call EXPAND_LIBNAME,comctl32 comdlg32 uuid shell32 ole32 oleaut32 version winspool gdi32)
|
||||
OS_LIBS += $(call EXPAND_LIBNAME,comctl32 comdlg32 uuid shell32 ole32 oleaut32 version winspool)
|
||||
RCINCLUDE = splash.rc
|
||||
ifndef GNU_CC
|
||||
RCFLAGS += -DMOZ_SUITE -I$(srcdir)
|
||||
|
|
|
|||
|
|
@ -1,100 +0,0 @@
|
|||
#
|
||||
# ***** BEGIN LICENSE BLOCK *****
|
||||
# Version: MPL 1.1/GPL 2.0/LGPL 2.1
|
||||
#
|
||||
# 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
|
||||
# Netscape Communications Corporation.
|
||||
# Portions created by the Initial Developer are Copyright (C) 2001
|
||||
# the Initial Developer. All Rights Reserved.
|
||||
#
|
||||
# Contributor(s):
|
||||
#
|
||||
# Alternatively, the contents of this file may be used under the terms of
|
||||
# either the GNU General Public License Version 2 or later (the "GPL"), or
|
||||
# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
|
||||
# in which case the provisions of the GPL or the LGPL are applicable instead
|
||||
# of those above. If you wish to allow use of your version of this file only
|
||||
# under the terms of either the GPL or the LGPL, and not to allow others to
|
||||
# use your version of this file under the terms of the MPL, indicate your
|
||||
# decision by deleting the provisions above and replace them with the notice
|
||||
# and other provisions required by the GPL or the LGPL. If you do not delete
|
||||
# the provisions above, a recipient may use your version of this file under
|
||||
# the terms of any one of the MPL, the GPL or the LGPL.
|
||||
#
|
||||
# ***** END LICENSE BLOCK *****
|
||||
|
||||
DEPTH = ../../../../../..
|
||||
topsrcdir = @top_srcdir@
|
||||
srcdir = @srcdir@
|
||||
VPATH = @srcdir@
|
||||
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
PROGRAM = setup$(BIN_SUFFIX)
|
||||
RESFILE = setup.res
|
||||
|
||||
REQUIRES = \
|
||||
setuprsc \
|
||||
xpnet \
|
||||
$(NULL)
|
||||
|
||||
LIBS = \
|
||||
$(DEPTH)/modules/libreg/standalone/$(LIB_PREFIX)mozregsa_s.$(LIB_SUFFIX) \
|
||||
$(DEPTH)/modules/libjar/standalone/$(LIB_PREFIX)jar50_s.$(LIB_SUFFIX) \
|
||||
$(DEPTH)/modules/zlib/standalone/$(LIB_PREFIX)mozz_s.$(LIB_SUFFIX) \
|
||||
$(DEPTH)/xpinstall/wizard/libxpnet/src/$(LIB_PREFIX)xpnet_s.$(LIB_SUFFIX) \
|
||||
$(NULL)
|
||||
|
||||
USE_STATIC_LIBS = 1
|
||||
|
||||
CSRCS = \
|
||||
dialogs.c \
|
||||
extra.c \
|
||||
ifuncns.c \
|
||||
setup.c \
|
||||
xpi.c \
|
||||
logging.c \
|
||||
supersede.c \
|
||||
version.c \
|
||||
process.c \
|
||||
|
||||
CPPSRCS = \
|
||||
shortcut.cpp \
|
||||
xpnetHook.cpp \
|
||||
nsEscape.cpp \
|
||||
$(NULL)
|
||||
|
||||
LOCAL_INCLUDES = -I$(srcdir) -I$(srcdir)/../uninstall
|
||||
|
||||
NO_DIST_INSTALL = 1
|
||||
|
||||
MOZ_WINCONSOLE = 0
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
_OS_LIBS = ole32 comdlg32 comctl32 shell32 version
|
||||
ifdef GNU_CC
|
||||
_OS_LIBS += gdi32 ws2_32 uuid
|
||||
endif
|
||||
OS_LIBS += $(call EXPAND_LIBNAME,$(_OS_LIBS))
|
||||
|
||||
libs:: $(PROGRAM)
|
||||
$(INSTALL) $(PROGRAM) $(DIST)/install
|
||||
|
||||
install:: $(PROGRAM)
|
||||
$(INSTALL) $(PROGRAM) $(DESTDIR)$(mozappdir)/install
|
||||
|
||||
clean clobber realclean clobber_all::
|
||||
$(RM) $(DIST)/install/$(PROGRAM)
|
||||
|
|
@ -1,84 +0,0 @@
|
|||
#
|
||||
# ***** BEGIN LICENSE BLOCK *****
|
||||
# Version: MPL 1.1/GPL 2.0/LGPL 2.1
|
||||
#
|
||||
# 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
|
||||
# Netscape Communications Corporation.
|
||||
# Portions created by the Initial Developer are Copyright (C) 2001
|
||||
# the Initial Developer. All Rights Reserved.
|
||||
#
|
||||
# Contributor(s):
|
||||
#
|
||||
# Alternatively, the contents of this file may be used under the terms of
|
||||
# either the GNU General Public License Version 2 or later (the "GPL"), or
|
||||
# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
|
||||
# in which case the provisions of the GPL or the LGPL are applicable instead
|
||||
# of those above. If you wish to allow use of your version of this file only
|
||||
# under the terms of either the GPL or the LGPL, and not to allow others to
|
||||
# use your version of this file under the terms of the MPL, indicate your
|
||||
# decision by deleting the provisions above and replace them with the notice
|
||||
# and other provisions required by the GPL or the LGPL. If you do not delete
|
||||
# the provisions above, a recipient may use your version of this file under
|
||||
# the terms of any one of the MPL, the GPL or the LGPL.
|
||||
#
|
||||
# ***** END LICENSE BLOCK *****
|
||||
|
||||
DEPTH = ../../../../../..
|
||||
topsrcdir = @top_srcdir@
|
||||
srcdir = @srcdir@
|
||||
VPATH = @srcdir@
|
||||
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
MODULE = uninstall
|
||||
PROGRAM = uninstall$(BIN_SUFFIX)
|
||||
RESFILE = uninstall.res
|
||||
REQUIRES = $(ZLIB_REQUIRES)
|
||||
USE_STATIC_LIBS = 1
|
||||
|
||||
EXPORTS = logkeys.h
|
||||
|
||||
CSRCS = \
|
||||
uninstall.c \
|
||||
extra.c \
|
||||
dialogs.c \
|
||||
parser.c \
|
||||
ifuncns.c \
|
||||
rdi.c \
|
||||
process.c \
|
||||
$(NULL)
|
||||
|
||||
MOZ_WINCONSOLE = 0
|
||||
|
||||
LOCAL_INCLUDES = -I$(srcdir)
|
||||
|
||||
ifdef GNU_CC
|
||||
OS_LIBS += -lshell32 -lversion -lgdi32
|
||||
else
|
||||
OS_LIBS += shell32.lib version.lib ole32.lib
|
||||
endif
|
||||
|
||||
NO_DIST_INSTALL = 1
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
libs:: $(PROGRAM)
|
||||
$(INSTALL) $(PROGRAM) $(DIST)/bin/uninstall
|
||||
|
||||
install:: $(PROGRAM)
|
||||
$(INSTALL) $(PROGRAM) $(DESTDIR)$(mozappdir)/bin/uninstall
|
||||
|
||||
clean clobber realclean clobber_all::
|
||||
$(RM) $(DIST)/bin/uninstall/$(PROGRAM)
|
||||
|
|
@ -68,7 +68,6 @@ OS_LIBS += $(call EXPAND_LIBNAME,comctl32 ws2_32)
|
|||
ifndef GNU_CC
|
||||
RCFLAGS += -I$(srcdir)
|
||||
else
|
||||
OS_LIBS += $(call EXPAND_LIBNAME,gdi32)
|
||||
RCFLAGS += --include-dir $(srcdir)
|
||||
DEFINES += -D_WIN32_IE=0x300
|
||||
endif
|
||||
|
|
|
|||
|
|
@ -79,7 +79,7 @@ LOCAL_INCLUDES = \
|
|||
OS_LIBS += $(call EXPAND_LIBNAME, uuid ole32 oleaut32 winspool)
|
||||
|
||||
ifneq ($(OS_ARCH), WINCE)
|
||||
OS_LIBS += $(call EXPAND_LIBNAME, comctl32 comdlg32 shell32 gdi32 imm32 winmm)
|
||||
OS_LIBS += $(call EXPAND_LIBNAME, comctl32 comdlg32 shell32 imm32)
|
||||
endif
|
||||
|
||||
SHARED_LIBRARY_LIBS = \
|
||||
|
|
|
|||
|
|
@ -274,7 +274,7 @@ endif
|
|||
|
||||
RCINCLUDE = splash.rc
|
||||
CPPSRCS += nsNativeAppSupportWin.cpp nsNativeAppSupportBase.cpp
|
||||
OS_LIBS += $(call EXPAND_LIBNAME,comctl32 comdlg32 uuid shell32 ole32 oleaut32 version winspool gdi32)
|
||||
OS_LIBS += $(call EXPAND_LIBNAME,comctl32 comdlg32 uuid shell32 ole32 oleaut32 version winspool)
|
||||
endif
|
||||
|
||||
ifneq (,$(filter windows os2 gtk gtk2,$(MOZ_WIDGET_TOOLKIT)))
|
||||
|
|
|
|||
|
|
@ -1,72 +0,0 @@
|
|||
#
|
||||
# ***** BEGIN LICENSE BLOCK *****
|
||||
# Version: MPL 1.1/GPL 2.0/LGPL 2.1
|
||||
#
|
||||
# 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
|
||||
# Netscape Communications Corporation.
|
||||
# Portions created by the Initial Developer are Copyright (C) 2001
|
||||
# the Initial Developer. All Rights Reserved.
|
||||
#
|
||||
# Contributor(s):
|
||||
#
|
||||
# Alternatively, the contents of this file may be used under the terms of
|
||||
# either of the GNU General Public License Version 2 or later (the "GPL"),
|
||||
# or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
|
||||
# in which case the provisions of the GPL or the LGPL are applicable instead
|
||||
# of those above. If you wish to allow use of your version of this file only
|
||||
# under the terms of either the GPL or the LGPL, and not to allow others to
|
||||
# use your version of this file under the terms of the MPL, indicate your
|
||||
# decision by deleting the provisions above and replace them with the notice
|
||||
# and other provisions required by the GPL or the LGPL. If you do not delete
|
||||
# the provisions above, a recipient may use your version of this file under
|
||||
# the terms of any one of the MPL, the GPL or the LGPL.
|
||||
#
|
||||
# ***** END LICENSE BLOCK *****
|
||||
|
||||
DEPTH = ../../../..
|
||||
topsrcdir = @top_srcdir@
|
||||
srcdir = @srcdir@
|
||||
VPATH = @srcdir@
|
||||
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
PROGRAM = nsinstall$(BIN_SUFFIX)
|
||||
RESFILE = nsinstall.res
|
||||
REQUIRES = $(ZLIB_REQUIRES)
|
||||
USE_STATIC_LIBS = 1
|
||||
|
||||
CPPSRCS = nsinstall.cpp
|
||||
|
||||
LIBS = \
|
||||
$(DEPTH)/modules/zlib/standalone/$(LIB_PREFIX)mozz_s.$(LIB_SUFFIX) \
|
||||
$(NULL)
|
||||
|
||||
LOCAL_INCLUDES = -I$(srcdir)
|
||||
ifdef GNU_CC
|
||||
OS_LIBS += -lgdi32
|
||||
endif
|
||||
|
||||
NO_DIST_INSTALL = 1
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
libs:: $(PROGRAM)
|
||||
$(INSTALL) $(PROGRAM) $(DIST)/install
|
||||
|
||||
install:: $(PROGRAM)
|
||||
$(SYSINSTALL) $(IFLAGS2) $(PROGRAM) $(DESTDIR)$(mozappdir)/install
|
||||
|
||||
clean clobber realclean clobber_all::
|
||||
$(RM) $(DIST)/install/$(PROGRAM)
|
||||
|
|
@ -1,99 +0,0 @@
|
|||
#
|
||||
# ***** BEGIN LICENSE BLOCK *****
|
||||
# Version: MPL 1.1/GPL 2.0/LGPL 2.1
|
||||
#
|
||||
# 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
|
||||
# Netscape Communications Corporation.
|
||||
# Portions created by the Initial Developer are Copyright (C) 2001
|
||||
# the Initial Developer. All Rights Reserved.
|
||||
#
|
||||
# Contributor(s):
|
||||
#
|
||||
# Alternatively, the contents of this file may be used under the terms of
|
||||
# either of the GNU General Public License Version 2 or later (the "GPL"),
|
||||
# or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
|
||||
# in which case the provisions of the GPL or the LGPL are applicable instead
|
||||
# of those above. If you wish to allow use of your version of this file only
|
||||
# under the terms of either the GPL or the LGPL, and not to allow others to
|
||||
# use your version of this file under the terms of the MPL, indicate your
|
||||
# decision by deleting the provisions above and replace them with the notice
|
||||
# and other provisions required by the GPL or the LGPL. If you do not delete
|
||||
# the provisions above, a recipient may use your version of this file under
|
||||
# the terms of any one of the MPL, the GPL or the LGPL.
|
||||
#
|
||||
# ***** END LICENSE BLOCK *****
|
||||
|
||||
DEPTH = ../../../..
|
||||
topsrcdir = @top_srcdir@
|
||||
srcdir = @srcdir@
|
||||
VPATH = @srcdir@
|
||||
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
PROGRAM = setup$(BIN_SUFFIX)
|
||||
RESFILE = setup.res
|
||||
REQUIRES = \
|
||||
setuprsc \
|
||||
xpnet \
|
||||
$(NULL)
|
||||
|
||||
USE_STATIC_LIBS = 1
|
||||
|
||||
CSRCS = \
|
||||
dialogs.c \
|
||||
extra.c \
|
||||
ifuncns.c \
|
||||
setup.c \
|
||||
xpi.c \
|
||||
logging.c \
|
||||
supersede.c \
|
||||
version.c \
|
||||
process.c \
|
||||
|
||||
CPPSRCS = \
|
||||
shortcut.cpp \
|
||||
xpnetHook.cpp \
|
||||
nsEscape.cpp \
|
||||
$(NULL)
|
||||
|
||||
LIBS = \
|
||||
$(DEPTH)/modules/libreg/standalone/$(LIB_PREFIX)mozregsa_s.$(LIB_SUFFIX) \
|
||||
$(DEPTH)/modules/libjar/standalone/$(LIB_PREFIX)jar50_s.$(LIB_SUFFIX) \
|
||||
$(DEPTH)/modules/zlib/standalone/$(LIB_PREFIX)mozz_s.$(LIB_SUFFIX) \
|
||||
../../libxpnet/src/$(LIB_PREFIX)xpnet_s.$(LIB_SUFFIX) \
|
||||
$(NULL)
|
||||
|
||||
LOCAL_INCLUDES = -I$(srcdir) -I$(srcdir)/../uninstall
|
||||
|
||||
NO_DIST_INSTALL = 1
|
||||
|
||||
MOZ_WINCONSOLE = 0
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
_OS_LIBS = ole32 comdlg32 shell32 version
|
||||
ifdef GNU_CC
|
||||
_OS_LIBS += gdi32 ws2_32 uuid
|
||||
endif
|
||||
OS_LIBS += $(call EXPAND_LIBNAME,$(_OS_LIBS))
|
||||
|
||||
libs:: $(PROGRAM)
|
||||
$(INSTALL) $(PROGRAM) $(DIST)/install
|
||||
|
||||
install:: $(PROGRAM)
|
||||
$(INSTALL) $(PROGRAM) $(DESTDIR)$(mozappdir)/install
|
||||
|
||||
clean clobber realclean clobber_all::
|
||||
$(RM) $(DIST)/install/$(PROGRAM)
|
||||
|
|
@ -1,86 +0,0 @@
|
|||
#
|
||||
# ***** BEGIN LICENSE BLOCK *****
|
||||
# Version: MPL 1.1/GPL 2.0/LGPL 2.1
|
||||
#
|
||||
# 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
|
||||
# Netscape Communications Corporation.
|
||||
# Portions created by the Initial Developer are Copyright (C) 2001
|
||||
# the Initial Developer. All Rights Reserved.
|
||||
#
|
||||
# Contributor(s):
|
||||
#
|
||||
# Alternatively, the contents of this file may be used under the terms of
|
||||
# either of the GNU General Public License Version 2 or later (the "GPL"),
|
||||
# or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
|
||||
# in which case the provisions of the GPL or the LGPL are applicable instead
|
||||
# of those above. If you wish to allow use of your version of this file only
|
||||
# under the terms of either the GPL or the LGPL, and not to allow others to
|
||||
# use your version of this file under the terms of the MPL, indicate your
|
||||
# decision by deleting the provisions above and replace them with the notice
|
||||
# and other provisions required by the GPL or the LGPL. If you do not delete
|
||||
# the provisions above, a recipient may use your version of this file under
|
||||
# the terms of any one of the MPL, the GPL or the LGPL.
|
||||
#
|
||||
# ***** END LICENSE BLOCK *****
|
||||
|
||||
DEPTH = ../../../..
|
||||
topsrcdir = @top_srcdir@
|
||||
srcdir = @srcdir@
|
||||
VPATH = @srcdir@
|
||||
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
MODULE = uninstall
|
||||
PROGRAM = uninstall$(BIN_SUFFIX)
|
||||
RESFILE = uninstall.res
|
||||
REQUIRES = $(ZLIB_REQUIRES)
|
||||
EXTRA_DSO_LIBS = mozz_s
|
||||
USE_STATIC_LIBS = 1
|
||||
|
||||
EXPORTS = logkeys.h
|
||||
|
||||
CSRCS = \
|
||||
uninstall.c \
|
||||
extra.c \
|
||||
dialogs.c \
|
||||
parser.c \
|
||||
ifuncns.c \
|
||||
rdi.c \
|
||||
process.c \
|
||||
$(NULL)
|
||||
|
||||
MOZ_WINCONSOLE = 0
|
||||
|
||||
LOCAL_INCLUDES = -I$(srcdir)
|
||||
|
||||
ifdef GNU_CC
|
||||
OS_LIBS += -lshell32 -lversion -lgdi32
|
||||
else
|
||||
OS_LIBS += shell32.lib version.lib
|
||||
endif
|
||||
|
||||
NO_DIST_INSTALL = 1
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
libs:: $(PROGRAM)
|
||||
$(INSTALL) $(PROGRAM) $(DIST)/install
|
||||
|
||||
install:: $(PROGRAM)
|
||||
$(INSTALL) $(PROGRAM) $(DESTDIR)$(mozappdir)/install
|
||||
|
||||
clean clobber realclean clobber_all::
|
||||
$(RM) $(DIST)/install/$(PROGRAM)
|
||||
|
||||
|
|
@ -138,7 +138,7 @@ EXTRA_DSO_LIBS += tracemalloc
|
|||
endif
|
||||
|
||||
ifeq ($(OS_ARCH),WINNT)
|
||||
OS_LIBS += $(call EXPAND_LIBNAME,comctl32 comdlg32 uuid shell32 ole32 oleaut32 version winspool gdi32)
|
||||
OS_LIBS += $(call EXPAND_LIBNAME,comctl32 comdlg32 uuid shell32 ole32 oleaut32 version winspool)
|
||||
RCINCLUDE = splash.rc
|
||||
ifndef GNU_CC
|
||||
RCFLAGS += -DMOZ_XULRUNNER -I$(srcdir)
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче