mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
Bug 454097 - [OS/2] get rid of VisualAge in configures; m-c part; r=mozilla
This commit is contained in:
Walter Meinl
parent
a364855211
commit
a04b09093c
@ -556,14 +556,6 @@ endif # MOZ_OPTIMIZE == 1
|
||||
endif # MOZ_OPTIMIZE
|
||||
endif # CROSS_COMPILE
|
||||
|
||||
ifeq ($(MOZ_OS2_TOOLS),VACPP)
|
||||
ifdef USE_STATIC_LIBS
|
||||
RTL_FLAGS += -Gd-
|
||||
else # !USE_STATIC_LIBS
|
||||
RTL_FLAGS += -Gd+
|
||||
endif
|
||||
endif
|
||||
|
||||
|
||||
ifeq ($(OS_ARCH)_$(GNU_CC),WINNT_)
|
||||
#// Currently, unless USE_STATIC_LIBS is defined, the multithreaded
|
||||
@ -615,7 +607,6 @@ endif
|
||||
# put on the link line for binaries, and should
|
||||
# we link statically or dynamic? Assuming dynamic for now.
|
||||
|
||||
ifneq ($(MOZ_OS2_TOOLS),VACPP)
|
||||
ifneq (WINNT_,$(OS_ARCH)_$(GNU_CC))
|
||||
ifneq (,$(filter-out WINCE,$(OS_ARCH)))
|
||||
LIBS_DIR = -L$(DIST)/bin -L$(DIST)/lib
|
||||
@ -624,7 +615,6 @@ LIBS_DIR += -L$(LIBXUL_SDK)/bin -L$(LIBXUL_SDK)/lib
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
|
||||
# Default location of include files
|
||||
IDL_DIR = $(DIST)/idl
|
||||
@ -716,7 +706,7 @@ endif
|
||||
# Set link flags according to whether we want a console.
|
||||
ifdef MOZ_WINCONSOLE
|
||||
ifeq ($(MOZ_WINCONSOLE),1)
|
||||
ifeq ($(MOZ_OS2_TOOLS),EMX)
|
||||
ifeq ($(OS_ARCH),OS2)
|
||||
BIN_FLAGS += -Zlinker -PM:VIO
|
||||
endif
|
||||
ifeq ($(OS_ARCH),WINNT)
|
||||
@ -727,10 +717,7 @@ WIN32_EXE_LDFLAGS += -SUBSYSTEM:CONSOLE
|
||||
endif
|
||||
endif
|
||||
else # MOZ_WINCONSOLE
|
||||
ifeq ($(MOZ_OS2_TOOLS),VACPP)
|
||||
LDFLAGS += -PM:PM
|
||||
endif
|
||||
ifeq ($(MOZ_OS2_TOOLS),EMX)
|
||||
ifeq ($(OS_ARCH),OS2)
|
||||
BIN_FLAGS += -Zlinker -PM:PM
|
||||
endif
|
||||
ifeq ($(OS_ARCH),WINNT)
|
||||
|
||||
@ -69,15 +69,11 @@ else
|
||||
ELOG :=
|
||||
endif
|
||||
|
||||
ifeq ($(MOZ_OS2_TOOLS),VACPP)
|
||||
_LIBNAME_RELATIVE_PATHS=1
|
||||
else
|
||||
ifeq (,$(filter-out WINNT WINCE,$(OS_ARCH)))
|
||||
ifndef GNU_CC
|
||||
_LIBNAME_RELATIVE_PATHS=1
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
|
||||
ifeq (,$(filter-out WINNT WINCE,$(OS_ARCH)))
|
||||
PWD := $(shell pwd)
|
||||
@ -289,12 +285,8 @@ _HOST_OBJS = \
|
||||
HOST_OBJS = $(strip $(_HOST_OBJS))
|
||||
endif
|
||||
|
||||
ifeq ($(MOZ_OS2_TOOLS),VACPP)
|
||||
LIBOBJS := $(OBJS)
|
||||
else
|
||||
LIBOBJS := $(addprefix \", $(OBJS))
|
||||
LIBOBJS := $(addsuffix \", $(LIBOBJS))
|
||||
endif
|
||||
|
||||
ifndef MOZ_AUTO_DEPS
|
||||
ifneq (,$(OBJS)$(XPIDLSRCS)$(SDK_XPIDLSRCS)$(SIMPLE_PROGRAMS))
|
||||
@ -564,15 +556,11 @@ IFLAGS1 = -m 644
|
||||
IFLAGS2 = -m 755
|
||||
endif
|
||||
|
||||
ifeq ($(MOZ_OS2_TOOLS),VACPP)
|
||||
OUTOPTION = -Fo# eol
|
||||
else
|
||||
ifeq (_WINNT,$(GNU_CC)_$(OS_ARCH))
|
||||
OUTOPTION = -Fo# eol
|
||||
else
|
||||
OUTOPTION = -o # eol
|
||||
endif # WINNT && !GNU_CC
|
||||
endif # VACPP
|
||||
ifneq (,$(filter WINCE,$(OS_ARCH)))
|
||||
OUTOPTION = -Fo# eol
|
||||
endif
|
||||
@ -851,7 +839,7 @@ distclean:: $(SUBMAKEFILES)
|
||||
$(wildcard *.$(OBJ_SUFFIX)) $(wildcard *.ho) $(wildcard host_*.o*) \
|
||||
$(wildcard *.$(LIB_SUFFIX)) $(wildcard *$(DLL_SUFFIX)) \
|
||||
$(wildcard *.$(IMPORT_LIB_SUFFIX))
|
||||
ifeq ($(MOZ_OS2_TOOLS),VACPP)
|
||||
ifeq ($(OS_ARCH),OS2)
|
||||
-rm -f $(PROGRAM:.exe=.map)
|
||||
endif
|
||||
|
||||
@ -867,10 +855,6 @@ $(PROGRAM): $(PROGOBJS) $(LIBS_DEPS) $(EXTRA_DEPS) $(EXE_DEF_FILE) $(RESFILE) Ma
|
||||
ifeq (WINCE,$(OS_ARCH))
|
||||
$(LD) -NOLOGO -OUT:$@ $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(PROGOBJS) $(RESFILE) $(LIBS) $(EXTRA_LIBS) $(OS_LIBS)
|
||||
else
|
||||
ifeq ($(MOZ_OS2_TOOLS),VACPP)
|
||||
$(LD) -OUT:$@ $(LDFLAGS) $(PROGOBJS) $(LIBS) $(EXTRA_LIBS) $(OS_LIBS) $(EXE_DEF_FILE) -ST:0x100000
|
||||
else
|
||||
|
||||
ifeq (_WINNT,$(GNU_CC)_$(OS_ARCH))
|
||||
$(LD) -NOLOGO -OUT:$@ -PDB:$(PDBFILE) $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(PROGOBJS) $(RESFILE) $(LIBS) $(EXTRA_LIBS) $(OS_LIBS)
|
||||
ifdef MSMANIFEST_TOOL
|
||||
@ -890,7 +874,6 @@ else # ! CPP_PROG_LINK
|
||||
$(CC) -o $@ $(CFLAGS) $(PROGOBJS) $(RESFILE) $(WIN32_EXE_LDFLAGS) $(SOLARIS_JEMALLOC_LDFLAGS) $(LDFLAGS) $(LIBS_DIR) $(LIBS) $(OS_LIBS) $(EXTRA_LIBS) $(BIN_FLAGS) $(EXE_DEF_FILE)
|
||||
endif # CPP_PROG_LINK
|
||||
endif # WINNT && !GNU_CC
|
||||
endif # OS2
|
||||
endif # WINCE
|
||||
|
||||
ifdef ENABLE_STRIP
|
||||
@ -907,9 +890,6 @@ endif
|
||||
endif # BeOS
|
||||
|
||||
$(HOST_PROGRAM): $(HOST_PROGOBJS) $(HOST_LIBS_DEPS) $(HOST_EXTRA_DEPS) Makefile Makefile.in
|
||||
ifeq ($(MOZ_OS2_TOOLS),VACPP)
|
||||
$(LD) -OUT:$@ $(LDFLAGS) $(HOST_OBJS) $(HOST_LIBS) $(HOST_EXTRA_LIBS) -ST:0x100000
|
||||
else
|
||||
ifeq (WINCE,$(OS_ARCH))
|
||||
$(HOST_LD) -NOLOGO -OUT:$@ $(HOST_OBJS) $(WIN32_EXE_LDFLAGS) $(HOST_LIBS) $(HOST_EXTRA_LIBS)
|
||||
else
|
||||
@ -929,7 +909,6 @@ else
|
||||
endif # CPP_PROG_LINK
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
|
||||
#
|
||||
# This is an attempt to support generation of multiple binaries
|
||||
@ -943,9 +922,6 @@ $(SIMPLE_PROGRAMS): %$(BIN_SUFFIX): %.$(OBJ_SUFFIX) $(LIBS_DEPS) $(EXTRA_DEPS) M
|
||||
ifeq (WINCE,$(OS_ARCH))
|
||||
$(LD) -nologo -entry:main -out:$@ $< $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(LIBS) $(EXTRA_LIBS) $(OS_LIBS)
|
||||
else
|
||||
ifeq ($(MOZ_OS2_TOOLS),VACPP)
|
||||
$(LD) -Out:$@ $< $(LDFLAGS) $(LIBS) $(OS_LIBS) $(EXTRA_LIBS) $(WRAP_MALLOC_LIB) $(PROFILER_LIBS)
|
||||
else
|
||||
ifeq (_WINNT,$(GNU_CC)_$(OS_ARCH))
|
||||
$(LD) -nologo -out:$@ -pdb:$(PDBFILE) $< $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(LIBS) $(EXTRA_LIBS) $(OS_LIBS)
|
||||
ifdef MSMANIFEST_TOOL
|
||||
@ -961,7 +937,6 @@ else
|
||||
$(CC) $(WRAP_MALLOC_CFLAGS) $(CFLAGS) $(OUTOPTION)$@ $< $(WIN32_EXE_LDFLAGS) $(SOLARIS_JEMALLOC_LDFLAGS) $(LDFLAGS) $(LIBS_DIR) $(LIBS) $(OS_LIBS) $(EXTRA_LIBS) $(WRAP_MALLOC_LIB) $(PROFILER_LIBS) $(BIN_FLAGS)
|
||||
endif # CPP_PROG_LINK
|
||||
endif # WINNT && !GNU_CC
|
||||
endif # OS/2 VACPP
|
||||
endif # WINCE
|
||||
|
||||
ifdef ENABLE_STRIP
|
||||
@ -972,9 +947,6 @@ ifdef MOZ_POST_PROGRAM_COMMAND
|
||||
endif
|
||||
|
||||
$(HOST_SIMPLE_PROGRAMS): host_%$(HOST_BIN_SUFFIX): host_%.$(OBJ_SUFFIX) $(HOST_LIBS_DEPS) $(HOST_EXTRA_DEPS) Makefile Makefile.in
|
||||
ifeq ($(MOZ_OS2_TOOLS),VACPP)
|
||||
$(HOST_LD) -OUT:$@ $< $(LDFLAGS) $(HOST_LIBS) $(HOST_EXTRA_LIBS) -ST:0x100000
|
||||
else
|
||||
ifeq (WINCE,$(OS_ARCH))
|
||||
$(HOST_LD) -NOLOGO -OUT:$@ $(WIN32_EXE_LDFLAGS) $< $(HOST_LIBS) $(HOST_EXTRA_LIBS)
|
||||
else
|
||||
@ -988,7 +960,6 @@ else
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
|
||||
#
|
||||
# Purify target. Solaris/sparc only to start.
|
||||
@ -1119,7 +1090,6 @@ $(SHARED_LIBRARY): $(OBJS) $(LOBJS) $(DEF_FILE) $(RESFILE) $(SHARED_LIBRARY_LIBS
|
||||
ifndef INCREMENTAL_LINKER
|
||||
rm -f $@
|
||||
endif
|
||||
ifneq ($(MOZ_OS2_TOOLS),VACPP)
|
||||
ifeq ($(OS_ARCH),OpenVMS)
|
||||
@if test ! -f $(VMS_SYMVEC_FILE); then \
|
||||
if test -f $(VMS_SYMVEC_FILE_MODULE); then \
|
||||
@ -1190,9 +1160,6 @@ else # non-Darwin
|
||||
@rm -f $(SUB_SHLOBJS)
|
||||
endif # Darwin
|
||||
@rm -f foodummyfilefoo $(DELETE_AFTER_LINK)
|
||||
else # os2 vacpp
|
||||
$(MKSHLIB) -O:$@ -DLL -INC:_dllentry $(LDFLAGS) $(OBJS) $(LOBJS) $(EXTRA_DSO_LDOPTS) $(OS_LIBS) $(EXTRA_LIBS) $(DEF_FILE)
|
||||
endif # !os2 vacpp
|
||||
chmod +x $@
|
||||
ifdef ENABLE_STRIP
|
||||
$(STRIP) $@
|
||||
@ -1283,12 +1250,8 @@ ifdef ASFILES
|
||||
# The AS_DASH_C_FLAG is needed cause not all assemblers (Solaris) accept
|
||||
# a '-c' flag.
|
||||
%.$(OBJ_SUFFIX): %.$(ASM_SUFFIX) Makefile Makefile.in
|
||||
ifeq ($(MOZ_OS2_TOOLS),VACPP)
|
||||
$(AS) -Fdo:./$(OBJDIR) -Feo:.$(OBJ_SUFFIX) $(ASFLAGS) $(AS_DASH_C_FLAG) $<
|
||||
else
|
||||
$(AS) -o $@ $(ASFLAGS) $(AS_DASH_C_FLAG) $(_VPATH_SRCS)
|
||||
endif
|
||||
endif
|
||||
|
||||
%.$(OBJ_SUFFIX): %.S Makefile Makefile.in
|
||||
$(AS) -o $@ $(ASFLAGS) -c $<
|
||||
|
||||
141
configure.in
141
configure.in
@ -2288,7 +2288,10 @@ case "$target" in
|
||||
*-os2*)
|
||||
MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -o $@'
|
||||
MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -o $@'
|
||||
AC_DEFINE(OS2)
|
||||
AC_DEFINE(XP_OS2)
|
||||
AC_DEFINE(OS2EMX_PLAIN_CHAR)
|
||||
AC_DEFINE(TCPV40HDRS)
|
||||
USE_SHORT_LIBNAME=1
|
||||
DLL_PREFIX=
|
||||
LIB_PREFIX=
|
||||
@ -2297,6 +2300,22 @@ case "$target" in
|
||||
DLL_SUFFIX=".dll"
|
||||
IMPORT_LIB_SUFFIX=lib
|
||||
DSO_PIC_CFLAGS=
|
||||
AR=emxomfar
|
||||
AR_FLAGS='r $@'
|
||||
CFLAGS="$CFLAGS -Zomf"
|
||||
CXXFLAGS="$CXXFLAGS -Zomf"
|
||||
DSO_LDOPTS='-Zdll'
|
||||
BIN_FLAGS='-Zlinker /ST:0x100000'
|
||||
IMPLIB='emximp -o'
|
||||
FILTER='emxexp -o'
|
||||
LDFLAGS='-Zmap'
|
||||
WARNINGS_AS_ERRORS='-Werror'
|
||||
MOZ_DEBUG_FLAGS="-g -fno-inline"
|
||||
MOZ_OPTIMIZE_FLAGS="-O2"
|
||||
MOZ_OPTIMIZE_LDFLAGS="-s -Zlinker /EXEPACK:2 -Zlinker /PACKCODE -Zlinker /PACKDATA"
|
||||
MOZ_XPCOM_OBSOLETE_LIBS='-L$(LIBXUL_DIST)/lib $(LIBXUL_DIST)/lib/xpcomct.lib'
|
||||
DYNAMIC_XPCOM_LIBS='-L$(LIBXUL_DIST)/lib $(LIBXUL_DIST)/lib/xpcom.lib $(LIBXUL_DIST)/lib/xpcomcor.lib'
|
||||
LIBXUL_LIBS='-L$(LIBXUL_DIST)/lib $(LIBXUL_DIST)/lib/xpcom.lib $(LIBXUL_DIST)/lib/xul.lib'
|
||||
TARGET_MD_ARCH=os2
|
||||
_PLATFORM_DEFAULT_TOOLKIT="cairo-os2"
|
||||
MOZ_ENABLE_POSTSCRIPT=
|
||||
@ -2309,91 +2328,26 @@ case "$target" in
|
||||
else
|
||||
AC_MSG_ERROR([MOZTOOLS is not set])
|
||||
fi
|
||||
if test -n "$MOZ_OS2_HIGH_MEMORY"; then
|
||||
DSO_LDOPTS="$DSO_LDOPTS -Zhigh-mem"
|
||||
LDFLAGS="$LDFLAGS -Zhigh-mem"
|
||||
MOZ_OPTIMIZE_LDFLAGS="$MOZ_OPTIMIZE_LDFLAGS -Zhigh-mem"
|
||||
AC_DEFINE(MOZ_OS2_HIGH_MEMORY)
|
||||
fi
|
||||
|
||||
# EMX/GCC build
|
||||
if test -n "$GNU_CC"; then
|
||||
AC_DEFINE(OS2)
|
||||
AC_DEFINE(XP_OS2_EMX)
|
||||
AC_DEFINE(OS2EMX_PLAIN_CHAR)
|
||||
AC_DEFINE(TCPV40HDRS)
|
||||
AR=emxomfar
|
||||
AR_FLAGS='r $@'
|
||||
CFLAGS="$CFLAGS -Zomf"
|
||||
CXXFLAGS="$CXXFLAGS -Zomf"
|
||||
DSO_LDOPTS='-Zdll'
|
||||
BIN_FLAGS='-Zlinker /ST:0x100000'
|
||||
IMPLIB='emximp -o'
|
||||
FILTER='emxexp -o'
|
||||
LDFLAGS='-Zmap'
|
||||
WARNINGS_AS_ERRORS='-Werror'
|
||||
MOZ_DEBUG_FLAGS="-g -fno-inline"
|
||||
MOZ_OPTIMIZE_FLAGS="-O2"
|
||||
MOZ_OPTIMIZE_LDFLAGS="-s -Zlinker /EXEPACK:2 -Zlinker /PACKCODE -Zlinker /PACKDATA"
|
||||
MOZ_XPCOM_OBSOLETE_LIBS='-L$(LIBXUL_DIST)/lib $(LIBXUL_DIST)/lib/xpcomct.lib'
|
||||
DYNAMIC_XPCOM_LIBS='-L$(LIBXUL_DIST)/lib $(LIBXUL_DIST)/lib/xpcom.lib $(LIBXUL_DIST)/lib/xpcomcor.lib'
|
||||
LIBXUL_LIBS='-L$(LIBXUL_DIST)/lib $(LIBXUL_DIST)/lib/xpcom.lib $(LIBXUL_DIST)/lib/xul.lib'
|
||||
if test -n "$MOZ_OS2_HIGH_MEMORY"; then
|
||||
DSO_LDOPTS="$DSO_LDOPTS -Zhigh-mem"
|
||||
LDFLAGS="$LDFLAGS -Zhigh-mem"
|
||||
MOZ_OPTIMIZE_LDFLAGS="$MOZ_OPTIMIZE_LDFLAGS -Zhigh-mem"
|
||||
AC_DEFINE(MOZ_OS2_HIGH_MEMORY)
|
||||
fi
|
||||
# GCC for OS/2 currently predefines these, but we don't want them
|
||||
_DEFINES_CFLAGS="$_DEFINES_CFLAGS -Uunix -U__unix -U__unix__"
|
||||
_DEFINES_CXXFLAGS="$_DEFINES_CXXFLAGS -Uunix -U__unix -U__unix__"
|
||||
|
||||
# GCC for OS/2 currently predefines these, but we don't want them
|
||||
_DEFINES_CFLAGS="$_DEFINES_CFLAGS -Uunix -U__unix -U__unix__"
|
||||
_DEFINES_CXXFLAGS="$_DEFINES_CXXFLAGS -Uunix -U__unix -U__unix__"
|
||||
|
||||
AC_CACHE_CHECK(for __declspec(dllexport),
|
||||
ac_os2_declspec,
|
||||
[AC_TRY_COMPILE([__declspec(dllexport) void ac_os2_declspec(void) {}],
|
||||
[return 0;],
|
||||
ac_os2_declspec="yes",
|
||||
ac_os2_declspec="no")])
|
||||
if test "$ac_os2_declspec" = "yes"; then
|
||||
FILTER='true'
|
||||
MOZ_OS2_USE_DECLSPEC='1'
|
||||
fi
|
||||
|
||||
# Visual Age C++ build
|
||||
elif test "$VACPP" = "yes"; then
|
||||
MOZ_BUILD_ROOT=`pwd -D`
|
||||
OBJ_SUFFIX=obj
|
||||
AR=-ilib
|
||||
AR_FLAGS='/NOL /NOI /O:$(subst /,\\,$@)'
|
||||
AR_LIST='/L'
|
||||
AR_EXTRACT='-*'
|
||||
AR_DELETE='-'
|
||||
AS=alp
|
||||
ASFLAGS='-Mb'
|
||||
AS_DASH_C_FLAG=''
|
||||
ASM_SUFFIX=asm
|
||||
LD='-ilink'
|
||||
CFLAGS="/Q /qlibansi /Gm+ /Su4 /Mp /Tl9"
|
||||
CXXFLAGS="/Q /qlibansi /Gm+ /Su4 /Mp /Tl9 /Gx+"
|
||||
MOZ_DEBUG_FLAGS="/Ti+"
|
||||
WARNINGS_AS_ERRORS='-WX'
|
||||
MOZ_OPTIMIZE_FLAGS="/O+ /Gl+ /G5 /qarch=pentium"
|
||||
LDFLAGS="/NOL /M"
|
||||
MOZ_DEBUG_LDFLAGS="/DE"
|
||||
MOZ_OPTIMIZE_LDFLAGS="/OPTFUNC /EXEPACK:2 /PACKCODE /PACKDATA"
|
||||
DSO_LDOPTS=''
|
||||
DSO_PIC_CFLAGS=
|
||||
IMPLIB='implib /NOL /NOI'
|
||||
FILTER='cppfilt -q -B -P'
|
||||
AC_DEFINE(NO_ANSI_KEYWORDS)
|
||||
AC_DEFINE(OS2,4)
|
||||
AC_DEFINE(_X86_)
|
||||
AC_DEFINE(XP_OS2_VACPP)
|
||||
AC_DEFINE(TCPV40HDRS)
|
||||
AC_DEFINE(NSCAP_DISABLE_DEBUG_PTR_TYPES)
|
||||
AC_DEFINE(STDC_HEADERS)
|
||||
MOZ_COMPONENT_NSPR_LIBS='$(NSPR_LIBS)'
|
||||
MKSHLIB='$(LD) $(DSO_LDOPTS)'
|
||||
MKCSHLIB='$(LD) $(DSO_LDOPTS)'
|
||||
MOZ_JS_LIBS='$(LIBXUL_DIST)/lib/mozjs.lib'
|
||||
MOZ_XPCOM_OBSOLETE_LIBS='$(LIBXUL_DIST)/lib/xpcomct.lib'
|
||||
DYNAMIC_XPCOM_LIBS='$(LIBXUL_DIST)/lib/xpcom.lib $(LIBXUL_DIST)/lib/xpcomcor.lib'
|
||||
LIBXUL_LIBS='$(LIBXUL_DIST)/lib/xpcom.lib $(LIBXUL_DIST)/lib/xul.lib'
|
||||
AC_CACHE_CHECK(for __declspec(dllexport),
|
||||
ac_os2_declspec,
|
||||
[AC_TRY_COMPILE([__declspec(dllexport) void ac_os2_declspec(void) {}],
|
||||
[return 0;],
|
||||
ac_os2_declspec="yes",
|
||||
ac_os2_declspec="no")])
|
||||
if test "$ac_os2_declspec" = "yes"; then
|
||||
FILTER='true'
|
||||
MOZ_OS2_USE_DECLSPEC='1'
|
||||
fi
|
||||
;;
|
||||
|
||||
@ -2658,14 +2612,6 @@ else
|
||||
AC_MSG_RESULT(no)
|
||||
fi
|
||||
|
||||
dnl Visual Age for os/2 also defines size_t and off_t in certain
|
||||
dnl header files. These defines make Visual Age use the mozilla
|
||||
dnl defines types.
|
||||
if test "$VACPP" = "yes"; then
|
||||
AC_DEFINE(__size_t)
|
||||
AC_DEFINE(__off_t)
|
||||
fi
|
||||
|
||||
dnl Check for int16_t, int32_t, int64_t, int64, uint, uint_t, and uint16_t.
|
||||
dnl ========================================================
|
||||
AC_MSG_CHECKING(for int16_t)
|
||||
@ -4077,10 +4023,7 @@ if test -n "$MOZ_NATIVE_NSPR"; then
|
||||
CFLAGS=$_SAVE_CFLAGS
|
||||
else
|
||||
NSPR_CFLAGS='`$(DEPTH)/nsprpub/config/nspr-config --prefix='${LIBXUL_DIST}' --includedir='${LIBXUL_DIST}'/include/nspr --cflags`'
|
||||
# explicitly set libs for Visual Age C++ for OS/2
|
||||
if test "$OS_ARCH" = "OS2" -a "$VACPP" = "yes"; then
|
||||
NSPR_LIBS="${LIBXUL_DIST}/lib/nspr${NSPR_VERSION}.lib ${LIBXUL_DIST}/lib/plc${NSPR_VERSION}.lib ${LIBXUL_DIST}/lib/plds${NSPR_VERSION}.lib ${_PTHREAD_LDFLAGS}"
|
||||
elif test "$OS_ARCH" = "WINCE"; then
|
||||
if test "$OS_ARCH" = "WINCE"; then
|
||||
NSPR_CFLAGS="-I${LIBXUL_DIST}/include/nspr"
|
||||
NSPR_LIBS="${LIBXUL_DIST}/lib/nspr${NSPR_VERSION}.lib ${LIBXUL_DIST}/lib/plc${NSPR_VERSION}.lib ${LIBXUL_DIST}/lib/plds${NSPR_VERSION}.lib "
|
||||
elif test "$OS_ARCH" = "WINNT"; then
|
||||
@ -8097,9 +8040,7 @@ fi # COMPILE_ENVIRONMENT
|
||||
dnl Set various defines and substitutions
|
||||
dnl ========================================================
|
||||
|
||||
if test "$OS_ARCH" = "OS2" -a "$VACPP" = "yes"; then
|
||||
LIBS='so32dll.lib tcp32dll.lib'
|
||||
elif test "$OS_ARCH" = "BeOS"; then
|
||||
if test "$OS_ARCH" = "BeOS"; then
|
||||
AC_DEFINE(XP_BEOS)
|
||||
MOZ_MOVEMAIL=1
|
||||
elif test "$OS_ARCH" = "Darwin"; then
|
||||
@ -8340,11 +8281,9 @@ fi
|
||||
if test -z "$MOZ_NATIVE_NSPR"; then
|
||||
# Hack to deal with the fact that we use NSPR_CFLAGS everywhere
|
||||
AC_MSG_WARN([Recreating autoconf.mk with updated nspr-config output])
|
||||
if test ! "$VACPP" && test "$OS_ARCH" != "WINNT" && test "$OS_ARCH" != "WINCE"; then
|
||||
if test "$OS_ARCH" != "WINNT" && test "$OS_ARCH" != "WINCE"; then
|
||||
NSPR_LIBS=`./nsprpub/config/nspr-config --prefix=$LIBXUL_DIST --exec-prefix=$MOZ_BUILD_ROOT/dist --libdir=$LIBXUL_DIST/lib --libs`
|
||||
$PERL -pi.bak -e "s '^NSPR_LIBS\\s*=.*'NSPR_LIBS = $NSPR_LIBS'" config/autoconf.mk
|
||||
fi
|
||||
if test "$OS_ARCH" != "WINNT" && test "$OS_ARCH" != "WINCE" ; then
|
||||
NSPR_CFLAGS=`./nsprpub/config/nspr-config --prefix=$LIBXUL_DIST --exec-prefix=$MOZ_BUILD_ROOT/dist --includedir=$LIBXUL_DIST/include/nspr --cflags`
|
||||
$PERL -pi.bak -e "s '^NSPR_CFLAGS\\s*=.*'NSPR_CFLAGS = $NSPR_CFLAGS'" config/autoconf.mk
|
||||
fi
|
||||
|
||||
@ -156,7 +156,7 @@
|
||||
#define LITTLE_ENDIAN 1234
|
||||
#endif
|
||||
|
||||
#if defined(_WINDOWS) || defined(XP_OS2_VACPP)
|
||||
#ifdef _WINDOWS
|
||||
#ifdef BYTE_ORDER
|
||||
#undef BYTE_ORDER
|
||||
#endif
|
||||
@ -188,14 +188,6 @@
|
||||
#define MAXPATHLEN 1024
|
||||
#endif
|
||||
|
||||
#ifdef XP_OS2_VACPP
|
||||
#include <os2.h>
|
||||
#define MAXPATHLEN CCHMAXPATH
|
||||
#define EPERM EINVAL
|
||||
#define ENOTDIR EBADPOS
|
||||
#define S_ISDIR(s) ((s) & S_IFDIR)
|
||||
#endif
|
||||
|
||||
#define EFTYPE EINVAL /* POSIX 1003.1 format errno. */
|
||||
|
||||
#ifndef STDERR_FILENO
|
||||
|
||||
@ -56,7 +56,7 @@ static char sccsid[] = "@(#)hash_bigkey.c 8.3 (Berkeley) 5/31/94";
|
||||
* collect_data
|
||||
*/
|
||||
|
||||
#if !defined(_WIN32) && !defined(_WINDOWS) && !defined(macintosh) && !defined(XP_OS2_VACPP)
|
||||
#if !defined(_WIN32) && !defined(_WINDOWS) && !defined(macintosh)
|
||||
#include <sys/param.h>
|
||||
#endif
|
||||
|
||||
|
||||
@ -78,7 +78,7 @@ static char sccsid[] = "@(#)hash_page.c 8.7 (Berkeley) 8/16/94";
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
|
||||
#if !defined(_WIN32) && !defined(_WINDOWS) && !defined(macintosh) && !defined(XP_OS2_VACPP)
|
||||
#if !defined(_WIN32) && !defined(_WINDOWS) && !defined(macintosh)
|
||||
#include <unistd.h>
|
||||
#endif
|
||||
|
||||
|
||||
@ -38,12 +38,12 @@ static char sccsid[] = "@(#)hash.c 8.9 (Berkeley) 6/16/94";
|
||||
|
||||
#include "watcomfx.h"
|
||||
|
||||
#if !defined(_WIN32) && !defined(_WINDOWS) && !defined(macintosh) && !defined(XP_OS2_VACPP)
|
||||
#if !defined(_WIN32) && !defined(_WINDOWS) && !defined(macintosh)
|
||||
#include <sys/param.h>
|
||||
#endif
|
||||
|
||||
#if !defined(macintosh)
|
||||
#ifdef XP_OS2_EMX
|
||||
#ifdef XP_OS2
|
||||
#include <sys/types.h>
|
||||
#endif
|
||||
#include <sys/stat.h>
|
||||
@ -60,7 +60,7 @@ static char sccsid[] = "@(#)hash.c 8.9 (Berkeley) 6/16/94";
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
|
||||
#if !defined(_WIN32) && !defined(_WINDOWS) && !defined(macintosh) && !defined(XP_OS2_VACPP)
|
||||
#if !defined(_WIN32) && !defined(_WINDOWS) && !defined(macintosh)
|
||||
#include <unistd.h>
|
||||
#endif
|
||||
#if defined(_WIN32) || defined(_WINDOWS)
|
||||
|
||||
@ -53,7 +53,7 @@ static char sccsid[] = "@(#)hash_buf.c 8.5 (Berkeley) 7/15/94";
|
||||
* Internal
|
||||
* newbuf
|
||||
*/
|
||||
#if !defined(_WIN32) && !defined(_WINDOWS) && !defined(macintosh) && !defined(XP_OS2_VACPP)
|
||||
#if !defined(_WIN32) && !defined(_WINDOWS) && !defined(macintosh)
|
||||
#include <sys/param.h>
|
||||
#endif
|
||||
|
||||
|
||||
@ -47,14 +47,10 @@ static char sccsid[] = "@(#)mktemp.c 8.1 (Berkeley) 6/4/93";
|
||||
#include <ctype.h>
|
||||
#include "mcom_db.h"
|
||||
|
||||
#if !defined(_WINDOWS) && !defined(XP_OS2_VACPP)
|
||||
#ifndef _WINDOWS
|
||||
#include <unistd.h>
|
||||
#endif
|
||||
|
||||
#ifdef XP_OS2_VACPP
|
||||
#include <process.h>
|
||||
#endif
|
||||
|
||||
#ifdef _WINDOWS
|
||||
#include <process.h>
|
||||
#include "winfile.h"
|
||||
|
||||
@ -16,14 +16,14 @@
|
||||
#include <ncompat.h>
|
||||
|
||||
/* The OS/2 VAC compiler doesn't appear to define __STDC__ and won't let us define it either */
|
||||
#if defined(__STDC__) || defined(XP_OS2_VACPP)
|
||||
#ifdef __STDC__
|
||||
#include <stdarg.h>
|
||||
#else
|
||||
#include <varargs.h>
|
||||
#endif
|
||||
|
||||
int
|
||||
#if defined(__STDC__) || defined(XP_OS2_VACPP)
|
||||
#ifdef __STDC__
|
||||
snprintf(char *str, size_t n, const char *fmt, ...)
|
||||
#else
|
||||
snprintf(str, n, fmt, va_alist)
|
||||
@ -39,7 +39,7 @@ snprintf(str, n, fmt, va_alist)
|
||||
#else
|
||||
int rval;
|
||||
#endif
|
||||
#if defined(__STDC__) || defined(XP_OS2_VACPP)
|
||||
#ifdef __STDC__
|
||||
va_start(ap, fmt);
|
||||
#else
|
||||
va_start(ap);
|
||||
|
||||
@ -47,7 +47,7 @@
|
||||
#if defined(XP_MAC)
|
||||
#include <stat.h>
|
||||
#else
|
||||
#ifdef XP_OS2_EMX
|
||||
#ifdef XP_OS2
|
||||
#include <sys/types.h>
|
||||
#endif
|
||||
#endif
|
||||
|
||||
@ -67,7 +67,7 @@
|
||||
#ifdef XP_MAC
|
||||
#include <stat.h>
|
||||
#else
|
||||
#if ( defined(BSDI) && !defined(BSDI_2) ) || defined(XP_OS2_EMX)
|
||||
#if ( defined(BSDI) && !defined(BSDI_2) ) || defined(XP_OS2)
|
||||
#include <sys/types.h>
|
||||
#endif
|
||||
#include <sys/stat.h>
|
||||
|
||||
@ -88,9 +88,4 @@ EXTRA_DSO_LDOPTS = \
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
# XXX os/2's gcc crashes on nsPrefMigration.cpp ("virtual memory exhausted")
|
||||
ifeq ($(MOZ_OS2_TOOLS),EMX)
|
||||
CXXFLAGS := $(filter-out -g,$(CXXFLAGS))
|
||||
endif
|
||||
|
||||
|
||||
|
||||
@ -144,13 +144,7 @@
|
||||
|
||||
/* OS/2 */
|
||||
#elif defined(XP_OS2)
|
||||
# ifdef XP_OS2_VACPP
|
||||
# define JNI_PUBLIC_API(ResultType) ResultType _System
|
||||
# define JNI_PUBLIC_VAR(VarType) VarType
|
||||
# define JNICALL _Optlink
|
||||
# define JNIEXPORT
|
||||
# define JNIIMPORT
|
||||
# elif defined(__declspec)
|
||||
# ifdef __declspec
|
||||
# define JNI_PUBLIC_API(ResultType) __declspec(dllexport) ResultType
|
||||
# define JNI_PUBLIC_VAR(VarType) VarType
|
||||
# define JNI_NATIVE_STUB(ResultType) __declspec(dllexport) ResultType
|
||||
|
||||
@ -121,11 +121,7 @@ extern "C" {
|
||||
|
||||
/* OS/2 */
|
||||
#elif defined(XP_OS2)
|
||||
# ifdef XP_OS2_VACPP
|
||||
# define JRI_PUBLIC_API(ResultType) ResultType _Optlink
|
||||
# define JRI_PUBLIC_VAR(VarType) VarType
|
||||
# define JRI_CALLBACK
|
||||
# elif defined(__declspec)
|
||||
# ifdef __declspec
|
||||
# define JRI_PUBLIC_API(ResultType) __declspec(dllexport) ResultType
|
||||
# define JRI_PUBLIC_VAR(VarType) VarType
|
||||
# define JRI_PUBLIC_VAR_EXP(VarType) __declspec(dllexport) VarType
|
||||
|
||||
@ -5,12 +5,10 @@
|
||||
|
||||
#if defined(VMS)
|
||||
#include <sys/timeb.h>
|
||||
#elif defined(XP_UNIX) || defined(XP_OS2_EMX) || defined(XP_BEOS)
|
||||
#elif defined(XP_UNIX) || defined(XP_OS2) || defined(XP_BEOS)
|
||||
#include <sys/time.h>
|
||||
#elif defined(WIN32)
|
||||
#include <windows.h>
|
||||
#elif defined(XP_OS2_VACPP)
|
||||
#include <sys/timeb.h>
|
||||
#else
|
||||
#error "Architecture not supported"
|
||||
#endif
|
||||
@ -37,7 +35,7 @@ int main(int argc, char **argv)
|
||||
now *= 1000000;
|
||||
now += (1000 * b.millitm);
|
||||
fprintf(stdout, "%Ld", now);
|
||||
#elif defined(XP_UNIX) || defined(XP_OS2_EMX) || defined(XP_BEOS)
|
||||
#elif defined(XP_UNIX) || defined(XP_OS2) || defined(XP_BEOS)
|
||||
long long now;
|
||||
struct timeval tv;
|
||||
#ifdef HAVE_SVID_GETTOD
|
||||
@ -70,33 +68,6 @@ int main(int argc, char **argv)
|
||||
now = (now - 116444736000000000i64) / 10i64;
|
||||
fprintf(stdout, "%I64d", now);
|
||||
#endif
|
||||
|
||||
#elif defined(XP_OS2_VACPP)
|
||||
/* no long long or i64 so we use a string */
|
||||
#include <string.h>
|
||||
char buf[24];
|
||||
char tbuf[7];
|
||||
time_t now;
|
||||
long mtime;
|
||||
int i;
|
||||
|
||||
struct timeb b;
|
||||
ftime(&b);
|
||||
now = b.time;
|
||||
_ltoa(now, buf, 10);
|
||||
|
||||
mtime = b.millitm * 1000;
|
||||
if (mtime == 0){
|
||||
++now;
|
||||
strcat(buf, "000000");
|
||||
} else {
|
||||
_ltoa(mtime, tbuf, 10);
|
||||
for (i = strlen(tbuf); i < 6; ++i)
|
||||
strcat(buf, "0");
|
||||
strcat(buf, tbuf);
|
||||
}
|
||||
fprintf(stdout, "%s", buf);
|
||||
|
||||
#else
|
||||
#error "Architecture not supported"
|
||||
#endif
|
||||
|
||||
@ -41,12 +41,10 @@
|
||||
|
||||
#if defined(VMS)
|
||||
#include <sys/timeb.h>
|
||||
#elif defined(XP_UNIX) || defined(XP_OS2_EMX) || defined(XP_BEOS)
|
||||
#elif defined(XP_UNIX) || defined(XP_OS2) || defined(XP_BEOS)
|
||||
#include <sys/time.h>
|
||||
#elif defined(WIN32)
|
||||
#include <windows.h>
|
||||
#elif defined(XP_OS2_VACPP)
|
||||
#include <sys/timeb.h>
|
||||
#else
|
||||
#error "Architecture not supported"
|
||||
#endif
|
||||
@ -73,7 +71,7 @@ int main(int argc, char **argv)
|
||||
now *= 1000000;
|
||||
now += (1000 * b.millitm);
|
||||
fprintf(stdout, "%Ld", now);
|
||||
#elif defined(XP_UNIX) || defined(XP_OS2_EMX) || defined(XP_BEOS)
|
||||
#elif defined(XP_UNIX) || defined(XP_OS2) || defined(XP_BEOS)
|
||||
long long now;
|
||||
struct timeval tv;
|
||||
#ifdef HAVE_SVID_GETTOD
|
||||
@ -107,32 +105,6 @@ int main(int argc, char **argv)
|
||||
fprintf(stdout, "%I64d", now);
|
||||
#endif
|
||||
|
||||
#elif defined(XP_OS2_VACPP)
|
||||
/* no long long or i64 so we use a string */
|
||||
#include <string.h>
|
||||
char buf[24];
|
||||
char tbuf[7];
|
||||
time_t now;
|
||||
long mtime;
|
||||
int i;
|
||||
|
||||
struct timeb b;
|
||||
ftime(&b);
|
||||
now = b.time;
|
||||
_ltoa(now, buf, 10);
|
||||
|
||||
mtime = b.millitm * 1000;
|
||||
if (mtime == 0){
|
||||
++now;
|
||||
strcat(buf, "000000");
|
||||
} else {
|
||||
_ltoa(mtime, tbuf, 10);
|
||||
for (i = strlen(tbuf); i < 6; ++i)
|
||||
strcat(buf, "0");
|
||||
strcat(buf, tbuf);
|
||||
}
|
||||
fprintf(stdout, "%s", buf);
|
||||
|
||||
#else
|
||||
#error "Architecture not supported"
|
||||
#endif
|
||||
|
||||
@ -150,7 +150,7 @@
|
||||
#elif defined(_WIN32)
|
||||
#define THUNK_BASED_THIS_ADJUST
|
||||
|
||||
#elif defined(__EMX__)
|
||||
#elif defined(__OS2__)
|
||||
#define THUNK_BASED_THIS_ADJUST
|
||||
|
||||
#elif defined (__APPLE__) && (__MACH__)
|
||||
|
||||
@ -41,7 +41,7 @@
|
||||
|
||||
#include "xpt_xdr.h"
|
||||
#include <stdio.h>
|
||||
#ifdef XP_OS2_EMX
|
||||
#ifdef XP_OS2
|
||||
#include <sys/types.h>
|
||||
#endif
|
||||
#include <sys/stat.h>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user