mozilla
/
pjs
зеркало из https://github.com/mozilla/pjs.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Landing nspr library name change, and plevent function call change.

This commit is contained in:
leaf%mozilla.org 1999-03-17 21:32:03 +00:00
Родитель 5ac57bfe34
Коммит 0a0f5ac00f
92 изменённых файлов: 145 добавлений и 1512 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
base/src/makefile.win
Просмотреть файл

@ -98,7 +98,7 @@ LCFLAGS = \
# These are the libraries we need to link with to create the dll
LLIBS= \
$(DIST)\lib\xpcom32.lib \
$(DIST)\lib\libplc21.lib \
$(DIST)\lib\plc3.lib \
$(LIBNSPR)
!if "$(MOZ_BITS)"=="32" && defined(MOZ_DEBUG) && defined(GLOWCODE)
LLIBS=$(LLIBS) $(GLOWDIR)\glowcode.lib

2
base/tests/makefile.win
Просмотреть файл

@ -45,7 +45,7 @@ LLIBS= \
$(DIST)\lib\netlib.lib \
!endif
$(LIBNSPR) \
$(DIST)\lib\libplc21.lib \
$(DIST)\lib\plc3.lib \
!if "$(MOZ_BITS)"=="32" && defined(MOZ_DEBUG) && defined(GLOWCODE)
$(GLOWDIR)\glowcode.lib \
!endif

2
caps/src/makefile.win
Просмотреть файл

@ -107,7 +107,7 @@ LINCS= $(LINCS) \
LLIBS = \
$(LIBNSPR) \
$(DIST)\lib\libplc21.lib \
$(DIST)\lib\plc3.lib \
$(DIST)\lib\xpcom32.lib \
$(DIST)\lib\xplib.lib \
$(DIST)\lib\zip3250.lib \

6
client.mk
Просмотреть файл

@ -153,7 +153,7 @@ ifdef MOZ_WITH_NSPR
NSPR_INSTALL_DIR := $(MOZ_WITH_NSPR)
NEED_WITH_NSPR := 1
else
ifneq ("$(wildcard /usr/lib/libnspr21*)","")
ifneq ("$(wildcard /usr/lib/libnspr3*)","")
NSPR_INSTALL_DIR := /usr
else
NSPR_INSTALL_DIR := $(OBJDIR)/nspr
@ -300,10 +300,10 @@ build: nspr $(OBJDIR)/Makefile
# Build & install nspr. Classic build, no autoconf.
# Linux/RPM available.
nspr: $(NSPR_INSTALL_DIR)/lib/libnspr21.so
nspr: $(NSPR_INSTALL_DIR)/lib/libnspr3.so
@echo NSPR is installed in $(NSPR_INSTALL_DIR)/lib objdir=$(OBJDIR)
$(NSPR_INSTALL_DIR)/lib/libnspr21.so:
$(NSPR_INSTALL_DIR)/lib/libnspr3.so:
@-$(MKDIR) -p $(NSPR_INSTALL_DIR)
($(MAKE) -C $(TOPSRCDIR)/nsprpub $(NSPR_GMAKE_OPTIONS))

8
config/config.mak
Просмотреть файл

@ -311,11 +311,11 @@ MAKE_UNMANGLE=if exist unmangle.bat call unmangle.bat
#//
#//------------------------------------------------------------------------
!if "$(MOZ_BITS)" == "16"
LIBNSPR=$(DIST)\lib\nspr21.lib
LIBNSPR=$(LIBNSPR) $(DIST)\lib\plds21.lib
LIBNSPR=$(DIST)\lib\nspr3.lib
LIBNSPR=$(LIBNSPR) $(DIST)\lib\plds3.lib
!else
LIBNSPR=$(DIST)\lib\libnspr21.lib
LIBNSPR=$(LIBNSPR) $(DIST)\lib\libplds21.lib
LIBNSPR=$(DIST)\lib\nspr3.lib
LIBNSPR=$(LIBNSPR) $(DIST)\lib\plds3.lib
!endif
NSPRDIR = nsprpub

4
config/config.mk
Просмотреть файл

@ -332,8 +332,8 @@ LIBAWT = $(DIST)/lib/libawt.$(LIB_SUFFIX)
LIBMMEDIA = $(DIST)/lib/libmmedia.$(LIB_SUFFIX)
NSPRDIR = nsprpub
LIBNSPR = $(DIST)/lib/libplds21.$(LIB_SUFFIX) $(DIST)/lib/libnspr21.$(LIB_SUFFIX)
PURELIBNSPR = $(DIST)/lib/purelibplds21.$(LIB_SUFFIX) $(DIST)/lib/purelibnspr21.$(LIB_SUFFIX)
LIBNSPR = $(DIST)/lib/libplds3.$(LIB_SUFFIX) $(DIST)/lib/libnspr3.$(LIB_SUFFIX)
PURELIBNSPR = $(DIST)/lib/purelibplds3.$(LIB_SUFFIX) $(DIST)/lib/purelibnspr3.$(LIB_SUFFIX)
ifdef DBMALLOC
LIBNSPR += $(DIST)/lib/libdbmalloc.$(LIB_SUFFIX)

44
configure поставляемый
Просмотреть файл

@ -7883,9 +7883,9 @@ else
LDFLAGS="$LDFLAGS -L${NSPR_LIBDIR} $NSPR_LIBS"
fi
echo $ac_n "checking "for PR_GetCurrentThread in -lnspr21"""... $ac_c" 1>&6
echo "configure:7888: checking "for PR_GetCurrentThread in -lnspr21"" >&5
LIBS="-lnspr21 $NSPR_LIBS $LIBS"
echo $ac_n "checking "for PR_GetCurrentThread in -lnspr3"""... $ac_c" 1>&6
echo "configure:7888: checking "for PR_GetCurrentThread in -lnspr3"" >&5
LIBS="-lnspr3 $NSPR_LIBS $LIBS"
if test "$cross_compiling" = yes; then
_NSPR_NEEDS_THREAD_LIB=1 result="no"
else
@ -7902,7 +7902,7 @@ else
EOF
if { (eval echo configure:7904: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
then
NSPR_LIBS="-lnspr21 $NSPR_LIBS" result="yes"
NSPR_LIBS="-lnspr3 $NSPR_LIBS" result="yes"
else
echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5
@ -8003,11 +8003,11 @@ fi
;;
esac
echo $ac_n "checking "for PR_GetCurrentThread in -lnspr21 with thread lib"""... $ac_c" 1>&6
echo "configure:8008: checking "for PR_GetCurrentThread in -lnspr21 with thread lib"" >&5
LIBS="-lnspr21 $NSPR_LIBS $LIBS"
echo $ac_n "checking "for PR_GetCurrentThread in -lnspr3 with thread lib"""... $ac_c" 1>&6
echo "configure:8008: checking "for PR_GetCurrentThread in -lnspr3 with thread lib"" >&5
LIBS="-lnspr3 $NSPR_LIBS $LIBS"
if test "$cross_compiling" = yes; then
MISSING_NSPR="$MISSING_NSPR -lnspr21" result="no"
MISSING_NSPR="$MISSING_NSPR -lnspr3" result="no"
else
cat > conftest.$ac_ext <<EOF
#line 8014 "configure"
@ -8022,12 +8022,12 @@ else
EOF
if { (eval echo configure:8024: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
then
NSPR_LIBS="-lnspr21 $NSPR_LIBS" result="yes"
NSPR_LIBS="-lnspr3 $NSPR_LIBS" result="yes"
else
echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5
rm -fr conftest*
MISSING_NSPR="$MISSING_NSPR -lnspr21" result="no"
MISSING_NSPR="$MISSING_NSPR -lnspr3" result="no"
fi
rm -fr conftest*
fi
@ -8037,14 +8037,14 @@ echo "$ac_t"""$result"" 1>&6
fi
echo $ac_n "checking for PL_CreateOptState in -lplc21""... $ac_c" 1>&6
echo "configure:8042: checking for PL_CreateOptState in -lplc21" >&5
ac_lib_var=`echo plc21'_'PL_CreateOptState | sed 'y%./+-%__p_%'`
echo $ac_n "checking for PL_CreateOptState in -lplc3""... $ac_c" 1>&6
echo "configure:8042: checking for PL_CreateOptState in -lplc3" >&5
ac_lib_var=`echo plc3'_'PL_CreateOptState | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_save_LIBS="$LIBS"
LIBS="-lplc21 $NSPR_LIBS $LIBS"
LIBS="-lplc3 $NSPR_LIBS $LIBS"
cat > conftest.$ac_ext <<EOF
#line 8050 "configure"
#include "confdefs.h"
@ -8072,20 +8072,20 @@ LIBS="$ac_save_LIBS"
fi
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
echo "$ac_t""yes" 1>&6
NSPR_LIBS="-lplc21 $NSPR_LIBS"
NSPR_LIBS="-lplc3 $NSPR_LIBS"
else
echo "$ac_t""no" 1>&6
MISSING_NSPR="$MISSING_NSPR -lplc21"
MISSING_NSPR="$MISSING_NSPR -lplc3"
fi
echo $ac_n "checking for PL_GetEvent in -lplds21""... $ac_c" 1>&6
echo "configure:8083: checking for PL_GetEvent in -lplds21" >&5
ac_lib_var=`echo plds21'_'PL_GetEvent | sed 'y%./+-%__p_%'`
echo $ac_n "checking for PL_GetEvent in -lplds3""... $ac_c" 1>&6
echo "configure:8083: checking for PL_GetEvent in -lplds3" >&5
ac_lib_var=`echo plds3'_'PL_GetEvent | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_save_LIBS="$LIBS"
LIBS="-lplds21 $NSPR_LIBS $LIBS"
LIBS="-lplds3 $NSPR_LIBS $LIBS"
cat > conftest.$ac_ext <<EOF
#line 8091 "configure"
#include "confdefs.h"
@ -8113,10 +8113,10 @@ LIBS="$ac_save_LIBS"
fi
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
echo "$ac_t""yes" 1>&6
NSPR_LIBS="-lplds21 $NSPR_LIBS"
NSPR_LIBS="-lplds3 $NSPR_LIBS"
else
echo "$ac_t""no" 1>&6
MISSING_NSPR="$MISSING_NSPR -lplds21"
MISSING_NSPR="$MISSING_NSPR -lplds3"
fi

28
configure.in
Просмотреть файл

@ -1300,8 +1300,8 @@ else
LDFLAGS="$LDFLAGS -L${NSPR_LIBDIR} $NSPR_LIBS"
fi
AC_MSG_CHECKING("for PR_GetCurrentThread in -lnspr21")
LIBS="-lnspr21 $NSPR_LIBS $LIBS"
AC_MSG_CHECKING("for PR_GetCurrentThread in -lnspr3")
LIBS="-lnspr3 $NSPR_LIBS $LIBS"
AC_TRY_RUN(
#include <stdio.h>
#include <nspr.h>
@ -1309,7 +1309,7 @@ AC_TRY_RUN(
PRThread *dummy = PR_GetCurrentThread();
exit(0);
}
, [NSPR_LIBS="-lnspr21 $NSPR_LIBS" result="yes"],
, [NSPR_LIBS="-lnspr3 $NSPR_LIBS" result="yes"],
[_NSPR_NEEDS_THREAD_LIB=1 result="no"],
[_NSPR_NEEDS_THREAD_LIB=1 result="no"] )
rm -f core
@ -1328,8 +1328,8 @@ case "$target" in
NSPR_LIBS="-lpthread $NSPR_LIBS") ;;
esac
AC_MSG_CHECKING("for PR_GetCurrentThread in -lnspr21 with thread lib")
LIBS="-lnspr21 $NSPR_LIBS $LIBS"
AC_MSG_CHECKING("for PR_GetCurrentThread in -lnspr3 with thread lib")
LIBS="-lnspr3 $NSPR_LIBS $LIBS"
AC_TRY_RUN(
#include <stdio.h>
#include <nspr.h>
@ -1337,20 +1337,20 @@ AC_MSG_CHECKING("for PR_GetCurrentThread in -lnspr21 with thread lib")
PRThread *dummy = PR_GetCurrentThread();
exit(0);
}
, [NSPR_LIBS="-lnspr21 $NSPR_LIBS" result="yes"],
[MISSING_NSPR="$MISSING_NSPR -lnspr21" result="no"],
[MISSING_NSPR="$MISSING_NSPR -lnspr21" result="no"] )
, [NSPR_LIBS="-lnspr3 $NSPR_LIBS" result="yes"],
[MISSING_NSPR="$MISSING_NSPR -lnspr3" result="no"],
[MISSING_NSPR="$MISSING_NSPR -lnspr3" result="no"] )
rm -f core
AC_MSG_RESULT("$result")
fi
dnl AC_CHECK_LIB(nspr21, PR_GetUniqueIdentity, NSPR_LIBS="-lnspr21 $NSPR_LIBS",
dnl [MISSING_NSPR="$MISSING_NSPR -lnspr21"], $NSPR_LIBS)
dnl AC_CHECK_LIB(nspr3, PR_GetUniqueIdentity, NSPR_LIBS="-lnspr21 $NSPR_LIBS",
dnl [MISSING_NSPR="$MISSING_NSPR -lnspr3"], $NSPR_LIBS)
AC_CHECK_LIB(plc21, PL_CreateOptState, NSPR_LIBS="-lplc21 $NSPR_LIBS",
[MISSING_NSPR="$MISSING_NSPR -lplc21"], $NSPR_LIBS)
AC_CHECK_LIB(plds21, PL_GetEvent, NSPR_LIBS="-lplds21 $NSPR_LIBS",
[MISSING_NSPR="$MISSING_NSPR -lplds21"], $NSPR_LIBS)
AC_CHECK_LIB(plc3, PL_CreateOptState, NSPR_LIBS="-lplc21 $NSPR_LIBS",
[MISSING_NSPR="$MISSING_NSPR -lplc3"], $NSPR_LIBS)
AC_CHECK_LIB(plds3, PL_GetEvent, NSPR_LIBS="-lplds21 $NSPR_LIBS",
[MISSING_NSPR="$MISSING_NSPR -lplds3"], $NSPR_LIBS)
CFLAGS=$_SAVE_CFLAGS
LDFLAGS=$_SAVE_LDFLAGS

8
dom/src/build/makefile.win
Просмотреть файл

@ -51,8 +51,8 @@ MISCDEP = \
$(DIST)\lib\netlib.lib \
$(DIST)\lib\js32$(VERSION_NUMBER).lib \
$(DIST)\lib\xpcom32.lib \
$(DIST)\lib\libplds21.lib \
$(DIST)\lib\libplc21.lib \
$(DIST)\lib\plds3.lib \
$(DIST)\lib\plc3.lib \
$(LIBNSPR)
LCFLAGS = \
@ -73,8 +73,8 @@ LLIBS= \
$(DIST)\lib\netlib.lib \
$(DIST)\lib\js32$(VERSION_NUMBER).lib \
$(DIST)\lib\xpcom32.lib \
$(DIST)\lib\libplds21.lib \
$(DIST)\lib\libplc21.lib \
$(DIST)\lib\plds3.lib \
$(DIST)\lib\plc3.lib \
$(LIBNSPR)
include <$(DEPTH)\config\rules.mak>

2
editor/base/makefile.win
Просмотреть файл

@ -114,7 +114,7 @@ LCFLAGS = \
# These are the libraries we need to link with to create the dll
LLIBS= \
$(DIST)\lib\xpcom32.lib \
$(DIST)\lib\libplc21.lib \
$(DIST)\lib\plc3.lib \
$(DIST)\lib\raptorbase.lib \
$(DIST)\lib\raptorhtmlpars.lib \
$(DIST)\lib\raptorwidget_s.lib \

103
extensions/wallet/module/makefile.win
Просмотреть файл

@ -1,103 +0,0 @@
# The contents of this file are subject to the Netscape Public License
# Version 1.0 (the "NPL"); you may not use this file except in
# compliance with the NPL. You may obtain a copy of the NPL at
# http://www.mozilla.org/NPL/
#
# Software distributed under the NPL is distributed on an "AS IS" basis,
# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
# for the specific language governing rights and limitations under the
# NPL.
#
# The Initial Developer of this code under the NPL is Netscape
# Communications Corporation. Portions created by Netscape are
# Copyright (C) 1998 Netscape Communications Corporation. All Rights
# Reserved.
#//------------------------------------------------------------------------
#//
# New build system where zip dll is build indepenant of java stubs.
#//
#//------------------------------------------------------------------------
MODULE = walletlib
EXPORTS = nsIWalletService.h \
$(NULL)
#//------------------------------------------------------------------------
#//
#// Specify the depth of the current directory relative to the
#// root of NS
#//
#//------------------------------------------------------------------------
DEPTH= ..\..\..
MAKE_OBJ_TYPE=DLL
#//------------------------------------------------------------------------
#//
#// Define any Public Make Variables here: (ie. PDFFILE, MAPFILE, ...)
#//
#//------------------------------------------------------------------------
DLLNAME=walletlib
#//------------------------------------------------------------------------
#//
#// Define the files necessary to build the target (ie. OBJS)
#//
#//------------------------------------------------------------------------
OBJS= \
.\$(OBJDIR)\nsWalletService.obj \
.\$(OBJDIR)\nsWalletFactory.obj \
$(NULL)
#//------------------------------------------------------------------------
#//
#// Define any Public Targets here (ie. PROGRAM, LIBRARY, DLL, ...)
#// (these must be defined before the common makefiles are included)
#//
#//------------------------------------------------------------------------
DLL=.\$(OBJDIR)\$(DLLNAME).dll
#//------------------------------------------------------------------------
#//
#// Define any local options for the make tools
#// (ie. LCFLAGS, LLFLAGS, LLIBS, LINCS)
#//
#//------------------------------------------------------------------------
LCFLAGS=-DNETSCAPE -D_IMPL_NS_NET -DNO_NETWORK_POLLING
WALLETLIBS=\
$(DIST)\lib\wallet.lib \
$(NULL)
LLIBS=$(LLIBS) $(LIBNSPR) \
$(WALLETLIBS) \
$(DIST)\lib\raptorbase.lib \
$(DIST)\lib\secfreenav32.lib \
$(DIST)\lib\libplc21.lib \
$(DIST)\lib\xppref32.lib \
$(DIST)\lib\xpcom32.lib \
$(DIST)\lib\xplib.lib \
$(DIST)\lib\netlib.lib \
$(NULL)
LINCS=$(LINCS) -I. \
-I$(PUBLIC)\xpcom \
-I$(PUBLIC)\wallet \
-I$(PUBLIC)\raptor \
-I$(PUBLIC)\netlib \
$(NULL)
#//------------------------------------------------------------------------
#//
#// Include the common makefile rules
#//
#//------------------------------------------------------------------------
include <$(DEPTH)/config/rules.mak>
$(DLL): $(WALLETLIBS)
libs:: $(DLL)
$(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).dll $(DIST)\bin
$(MAKE_INSTALL) .\$(OBJDIR)\walletlib.lib $(DIST)\lib

2
gfx/src/windows/makefile.win
Просмотреть файл

@ -76,7 +76,7 @@ LLIBS= \
$(DIST)\lib\img32$(VERSION_NUMBER).lib \
$(DIST)\lib\js32$(VERSION_NUMBER).lib \
$(DIST)\lib\util.lib \
$(DIST)\lib\libplc21.lib \
$(DIST)\lib\plc3.lib \
$(DIST)\lib\netlib.lib \
$(DIST)\lib\raptorgfx_s.lib \
!if defined(NGLAYOUT_DDRAW)

2
gfx/tests/btest/makefile.win
Просмотреть файл

@ -29,7 +29,7 @@ LLIBS= \
$(DIST)\lib\raptorgfxwin.lib \
$(DIST)\lib\xpcom32.lib \
$(LIBNSPR) \
$(DIST)\lib\libplc21.lib \
$(DIST)\lib\plc3.lib \
$(DIST)\lib\img32$(VERSION_NUMBER).lib \
$(DIST)\lib\util.lib \
comdlg32.lib \

2
gfx/tests/makefile.win
Просмотреть файл

@ -33,7 +33,7 @@ LLIBS= \
$(DIST)\lib\raptorgfxwin.lib \
$(DIST)\lib\xpcom32.lib \
$(LIBNSPR) \
$(DIST)\lib\libplc21.lib
$(DIST)\lib\plc3.lib
include <$(DEPTH)\config\rules.mak>

2
htmlparser/robot/makefile.win
Просмотреть файл

@ -26,7 +26,7 @@ LLIBS= \
$(DIST)\lib\raptorbase.lib \
$(DIST)\lib\xpcom32.lib \
$(LIBNSPR) \
$(DIST)\lib\libplc21.lib \
$(DIST)\lib\plc3.lib \
$(DIST)\lib\netlib.lib \
$(NULL)

2
htmlparser/src/makefile.win
Просмотреть файл

@ -135,7 +135,7 @@ LCFLAGS = \
LLIBS= \
$(DIST)\lib\xpcom32.lib \
$(DIST)\lib\raptorbase.lib \
$(DIST)\lib\libplc21.lib \
$(DIST)\lib\plc3.lib \
$(DIST)\lib\expat.lib \
$(LIBNSPR)

2
intl/locale/src/windows/makefile.win
Просмотреть файл

@ -55,7 +55,7 @@ LCFLAGS = \
LLIBS= \
$(DIST)\lib\xpcom32.lib \
$(DIST)\lib\raptorbase.lib \
$(DIST)\lib\libplc21.lib \
$(DIST)\lib\plc3.lib \
$(DIST)\lib\nslocale_s.lib \
$(LIBNSPR)

2
intl/locale/tests/makefile.win
Просмотреть файл

@ -35,7 +35,7 @@ LLIBS= \
$(DIST)\lib\xpcom32.lib \
$(LIBNSPR) \
$(DIST)\lib\raptorbase.lib \
$(DIST)\lib\libplc21.lib \
$(DIST)\lib\plc3.lib \
$(DIST)\lib\nslocale.lib
LLFLAGS= /NODEFAULTLIB msvcirt.lib msvcrt.lib

2
intl/lwbrk/src/makefile.win
Просмотреть файл

@ -55,7 +55,7 @@ DLL=.\$(OBJDIR)\$(DLLNAME).dll
LLIBS= \
$(DIST)\lib\xpcom32.lib \
$(DIST)\lib\libplc21.lib \
$(DIST)\lib\plc3.lib \
$(DIST)\lib\raptorbase.lib \
$(LIBNSPR)

2
intl/lwbrk/tests/makefile.win
Просмотреть файл

@ -33,7 +33,7 @@ LLIBS= \
$(DIST)\lib\raptorbase.lib \
$(DIST)\lib\xpcom32.lib \
$(LIBNSPR) \
$(DIST)\lib\libplc21.lib
$(DIST)\lib\plc3.lib
include <$(DEPTH)\config\rules.mak>

2
intl/strres/src/makefile.win
Просмотреть файл

@ -53,7 +53,7 @@ LCFLAGS = \
LLIBS= \
$(DIST)\lib\xpcom32.lib \
$(DIST)\lib\raptorbase.lib \
$(DIST)\lib\libplc21.lib \
$(DIST)\lib\plc3.lib \
$(LIBNSPR)
!if "$(MOZ_BITS)"=="32" && defined(MOZ_DEBUG) && defined(GLOWCODE)
LLIBS=$(LLIBS) $(GLOWDIR)\glowcode.lib

2
intl/strres/tests/makefile.win
Просмотреть файл

@ -33,7 +33,7 @@ LLIBS= \
$(DIST)\lib\xpcom32.lib \
$(DIST)\lib\raptorbase.lib \
$(LIBNSPR) \
$(DIST)\lib\libplc21.lib \
$(DIST)\lib\plc3.lib \
!if "$(MOZ_BITS)"=="32" && defined(MOZ_DEBUG) && defined(GLOWCODE)
$(GLOWDIR)\glowcode.lib \
!endif

2
intl/unicharutil/src/makefile.win
Просмотреть файл

@ -53,7 +53,7 @@ DLL=.\$(OBJDIR)\$(DLLNAME).dll
LLIBS= \
$(DIST)\lib\xpcom32.lib \
$(DIST)\lib\libplc21.lib \
$(DIST)\lib\plc3.lib \
$(LIBNSPR)
include <$(DEPTH)\config\rules.mak>

2
intl/unicharutil/tests/makefile.win
Просмотреть файл

@ -32,7 +32,7 @@ LINCS=-I$(PUBLIC)\xpcom -I$(PUBLIC)\unicharutil -I$(PUBLIC)\raptor
LLIBS= \
$(DIST)\lib\xpcom32.lib \
$(LIBNSPR) \
$(DIST)\lib\libplc21.lib
$(DIST)\lib\plc3.lib
include <$(DEPTH)\config\rules.mak>

14
jpeg/jpg1640.def
Просмотреть файл

@ -40,10 +40,10 @@ EXPORTS
_jpeg_close_file = _jpeg_close_file @25
IMPORTS
_malloc = nspr21.2
_realloc = nspr21.3
_calloc = nspr21.4
_free = nspr21.5
_getenv = nspr21.9
_printf = nspr21.11
_sscanf = nspr21.33
_malloc = nspr3.2
_realloc = nspr3.3
_calloc = nspr3.4
_free = nspr3.5
_getenv = nspr3.9
_printf = nspr3.11
_sscanf = nspr3.33

4
js/src/Makefile.ref
Просмотреть файл

@ -34,9 +34,9 @@ ifdef JS_THREADSAFE
DEFINES += -DJS_THREADSAFE
INCLUDES += -I../../dist/$(OBJDIR)/include
ifdef USE_MSVC
OTHER_LIBS += ../../dist/$(OBJDIR)/lib/libnspr21.lib
OTHER_LIBS += ../../dist/$(OBJDIR)/lib/nspr3.lib
else
OTHER_LIBS += -L../../dist/$(OBJDIR)/lib -lnspr21
OTHER_LIBS += -L../../dist/$(OBJDIR)/lib -lnspr3
endif
endif

6
js/src/jsconfig.mk
Просмотреть файл

@ -62,9 +62,9 @@ ifdef JS_LIVECONNECT
endif
ifdef JS_THREADSAFE
ifeq ($(OS_ARCH), HP-UX)
SHIP_LIBS += libnspr21.sl
SHIP_LIBS += libnspr3.sl
else
SHIP_LIBS += libnspr21.so
SHIP_LIBS += libnspr3.so
endif
endif
ifeq ($(OS_ARCH), WINNT)
@ -73,7 +73,7 @@ ifeq ($(OS_ARCH), WINNT)
SHIP_LIBS += jsj.dll
endif
ifdef JS_THREADSAFE
SHIP_LIBS += libnspr21.dll
SHIP_LIBS += nspr3.dll
endif
endif
SHIP_LIBS := $(addprefix $(SHIP_DIST)/lib/, $(SHIP_LIBS))

4
js/src/liveconnect/Makefile.ref
Просмотреть файл

@ -77,9 +77,9 @@ endif
ifdef JS_THREADSAFE
ifdef USE_MSVC
OTHER_LIBS += $(DEPTH)/../../dist/$(OBJDIR)/lib/libnspr21.lib
OTHER_LIBS += $(DEPTH)/../../dist/$(OBJDIR)/lib/nspr3.lib
else
OTHER_LIBS += -L$(DEPTH)/../../dist/$(OBJDIR)/lib -lnspr21
OTHER_LIBS += -L$(DEPTH)/../../dist/$(OBJDIR)/lib -lnspr3
endif
endif

141
js/src/xpcom/xpcom.dsp
Просмотреть файл

@ -1,141 +0,0 @@
# Microsoft Developer Studio Project File - Name="xpcom" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 5.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
CFG=xpcom - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
!MESSAGE NMAKE /f "xpcom.mak".
!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "xpcom.mak" CFG="xpcom - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE "xpcom - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "xpcom - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE
# Begin Project
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
MTL=midl.exe
RSC=rc.exe
!IF "$(CFG)" == "xpcom - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "Release"
# PROP BASE Intermediate_Dir "Release"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "Release"
# PROP Intermediate_Dir "Release"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
# ADD CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386
!ELSEIF "$(CFG)" == "xpcom - Win32 Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "Debug"
# PROP BASE Intermediate_Dir "Debug"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "Debug"
# PROP Intermediate_Dir "Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "EXPORT_JS_API" /D "_WIN32" /D "WIN32" /D "_DEBUG" /D "DEBUG" /D "XP_PC" /D "_WINDOWS" /D "JSFILE" /D "JS_THREADSAFE" /D "NSPR20" /FR /YX /FD /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib H:\trees\ns\dist\WINNT4.0_DBG.OBJ\lib\libnspr21.lib h:\trees\mozilla.org\mozilla\dist\WIN32_D.OBJ\lib\xpcom32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept
!ENDIF
# Begin Target
# Name "xpcom - Win32 Release"
# Name "xpcom - Win32 Debug"
# Begin Source File
SOURCE=.\jsContext.cpp
# End Source File
# Begin Source File
SOURCE=.\jsContext.h
# End Source File
# Begin Source File
SOURCE=.\jsIContext.h
# End Source File
# Begin Source File
SOURCE=.\jsIErrorReporter.h
# End Source File
# Begin Source File
SOURCE=.\jsIFunction.h
# End Source File
# Begin Source File
SOURCE=.\jsIRuntime.h
# End Source File
# Begin Source File
SOURCE=.\jsIScript.h
# End Source File
# Begin Source File
SOURCE=.\jsIScriptable.cpp
# End Source File
# Begin Source File
SOURCE=.\jsIScriptable.h
# End Source File
# Begin Source File
SOURCE=.\jsRuntime.cpp
# End Source File
# Begin Source File
SOURCE=.\jsRuntime.h
# End Source File
# Begin Source File
SOURCE=.\JSWrapper.cpp
# End Source File
# Begin Source File
SOURCE=.\JSWrapper.h
# End Source File
# End Target
# End Project

2
layout/base/tests/makefile.win
Просмотреть файл

@ -29,7 +29,7 @@ LLIBS= \
$(DIST)\lib\xpcom32.lib \
$(DIST)\lib\jsdom.lib \
$(LIBNSPR) \
$(DIST)\lib\libplc21.lib
$(DIST)\lib\plc3.lib
include <$(DEPTH)\config\rules.mak>

4
layout/build/makefile.win
Просмотреть файл

@ -52,7 +52,7 @@ MISCDEP = \
$(DIST)\lib\raptorgfxwin.lib \
$(DIST)\lib\raptorhtmlpars.lib \
$(DIST)\lib\jsdom.lib \
$(DIST)\lib\libplc21.lib \
$(DIST)\lib\plc3.lib \
$(DIST)\lib\js3250.lib \
$(DIST)\lib\oji.lib \
$(DIST)\lib\jsj3250.lib \
@ -85,7 +85,7 @@ LLIBS= \
$(DIST)\lib\raptorhtmlpars.lib \
$(DIST)\lib\jsdom.lib \
$(DIST)\lib\netlib.lib \
$(DIST)\lib\libplc21.lib \
$(DIST)\lib\plc3.lib \
$(DIST)\lib\js32$(VERSION_NUMBER).lib \
!if defined(MOZ_DEBUG) && defined(GLOWCODE) && "$(MOZ_BITS)"=="32"
$(GLOWDIR)\glowcode.lib \

2
layout/html/tests/makefile.win
Просмотреть файл

@ -60,7 +60,7 @@ LLIBS= \
$(DIST)\lib\jsdom.lib \
$(DIST)\lib\netlib.lib \
$(LIBNSPR) \
$(DIST)\lib\libplc21.lib \
$(DIST)\lib\plc3.lib \
$(DIST)\lib\js32$(VERSION_NUMBER).lib
include <$(DEPTH)\config\rules.mak>

2
mailnews/base/build/makefile.win
Просмотреть файл

@ -87,7 +87,7 @@ LLIBS= \
$(DIST)\lib\xpcom32.lib \
$(DIST)\lib\raptorbase.lib \
$(DIST)\lib\xplib.lib \
$(DIST)\lib\libplc21.lib \
$(DIST)\lib\plc3.lib \
$(DIST)\lib\js32$(VERSION_NUMBER).lib \
$(DIST)\lib\msgcore.lib \
$(DIST)\lib\appcores.lib \

6
mailnews/base/tests/Makefile.in
Просмотреть файл

@ -33,9 +33,9 @@ LIBS = \
-L$(DIST)/bin \
-lxpcom \
-lreg \
-lnspr21 \
-lplc21 \
-lplds21 \
-lnspr3 \
-lplc3 \
-lplds3 \
$(NULL)

2
mailnews/compose/build/makefile.win
Просмотреть файл

@ -84,7 +84,7 @@ LLIBS= \
$(DIST)\lib\xpcom32.lib \
$(DIST)\lib\raptorbase.lib \
$(DIST)\lib\xplib.lib \
$(DIST)\lib\libplc21.lib \
$(DIST)\lib\plc3.lib \
$(DIST)\lib\js32$(VERSION_NUMBER).lib \
$(DIST)\lib\msgcore.lib \
$(DIST)\lib\msgcompose.lib \

2
mailnews/compose/tests/smtp/makefile.win
Просмотреть файл

@ -35,7 +35,7 @@ MYLIBS= \
$(DIST)\lib\raptorgfxwin.lib \
$(DIST)\lib\raptorwidget.lib \
$(DIST)\lib\netlib.lib \
$(DIST)\lib\libplc21.lib \
$(DIST)\lib\plc3.lib \
$(DIST)\lib\xplib.lib \
$(NULL)

2
mailnews/local/build/makefile.win
Просмотреть файл

@ -44,7 +44,7 @@ LLIBS=\
$(DIST)\lib\msgdb.lib \
$(DIST)\lib\msglocal.lib \
$(LIBNSPR) \
$(DIST)\lib\libplc21.lib \
$(DIST)\lib\plc3.lib \
$(DIST)\lib\raptorbase.lib \
$(DIST)\lib\rdfutil_s.lib \
$(DIST)\lib\xplib.lib \

2
mailnews/local/tests/mailbox/makefile.win
Просмотреть файл

@ -44,7 +44,7 @@ MYLIBS= \
$(DIST)\lib\raptorgfxwin.lib \
$(DIST)\lib\raptorwidget.lib \
$(DIST)\lib\netlib.lib \
$(DIST)\lib\libplc21.lib \
$(DIST)\lib\plc3.lib \
$(DIST)\lib\rdfutil_s.lib \
$(DIST)\lib\msgcore.lib \
$(DIST)\lib\msgdb.lib \

2
mailnews/local/tests/mboxParser/makefile.win
Просмотреть файл

@ -42,7 +42,7 @@ MYLIBS= \
$(DIST)\lib\raptorgfxwin.lib \
$(DIST)\lib\raptorwidget.lib \
$(DIST)\lib\netlib.lib \
$(DIST)\lib\libplc21.lib \
$(DIST)\lib\plc3.lib \
$(DIST)\lib\msglocal.lib \
$(DIST)\lib\msgcore.lib \
$(DIST)\lib\rdf.lib \

2
mailnews/local/tests/pop3/makefile.win
Просмотреть файл

@ -42,7 +42,7 @@ MYLIBS= \
$(DIST)\lib\raptorgfxwin.lib \
$(DIST)\lib\raptorwidget.lib \
$(DIST)\lib\netlib.lib \
$(DIST)\lib\libplc21.lib \
$(DIST)\lib\plc3.lib \
$(DIST)\lib\rdf.lib \
$(DIST)\lib\msglocal.lib \
$(DIST)\lib\msgcore.lib \

2
mailnews/mime/cthandlers/calendar/makefile.win
Просмотреть файл

@ -88,7 +88,7 @@ MSGLIBS= \
LLIBS= \
$(LLIBS) \
$(LIBNSPR) \
$(DIST)\lib\libplc21.lib \
$(DIST)\lib\plc3.lib \
$(DIST)\lib\xplib.lib \
$(DIST)\lib\xpcom32.lib \
$(NULL)

2
mailnews/mime/cthandlers/vcard/makefile.win
Просмотреть файл

@ -96,7 +96,7 @@ MSGLIBS= \
LLIBS= \
$(LLIBS) \
$(LIBNSPR) \
$(DIST)\lib\libplc21.lib \
$(DIST)\lib\plc3.lib \
$(DIST)\lib\js32$(VERSION_NUMBER).lib \
$(DIST)\lib\netlib.lib \
$(DIST)\lib\xppref32.lib \

2
mailnews/mime/src/makefile.win
Просмотреть файл

@ -157,7 +157,7 @@ MSGLIBS= \
LLIBS= \
$(LLIBS) \
$(LIBNSPR) \
$(DIST)\lib\libplc21.lib \
$(DIST)\lib\plc3.lib \
$(DIST)\lib\js32$(VERSION_NUMBER).lib \
$(DIST)\lib\netlib.lib \
$(DIST)\lib\xppref32.lib \

2
mailnews/news/tests/nntp/makefile.win
Просмотреть файл

@ -35,7 +35,7 @@ MYLIBS= \
$(DIST)\lib\raptorgfxwin.lib \
$(DIST)\lib\raptorwidget.lib \
$(DIST)\lib\netlib.lib \
$(DIST)\lib\libplc21.lib \
$(DIST)\lib\plc3.lib \
$(DIST)\lib\nntp.lib \
$(DIST)\lib\nntpTest.lib \
$(DIST)\lib\msgcore.lib \

2
mailnews/ui/messenger/src/makefile.win
Просмотреть файл

@ -63,7 +63,7 @@ LLIBS = \
$(DIST)\lib\raptorbase.lib \
$(DIST)\lib\raptorgfxwin.lib\
$(LIBNSPR) \
$(DIST)\lib\libplc21.lib \
$(DIST)\lib\plc3.lib \
$(DIST)\lib\nntp.lib \
$(DIST)\lib\nntpTest.lib \
$(DIST)\lib\msgCore.lib \

2
modules/libimg/src/makefile.win
Просмотреть файл

@ -50,7 +50,7 @@ LCFLAGS = $(LCFLAGS) /TP
LLIBS=$(DIST)\lib\png.lib \
$(LIBNSPR) \
$(LIBJPEG) \
$(DIST)\lib\libplc21.lib \
$(DIST)\lib\plc3.lib \
$(DIST)\lib\util.lib \
$(DIST)\lib\zip$(MOZ_BITS)$(VERSION_NUMBER).lib \
$(DIST)\lib\xpcom32.lib \

2
modules/libpref/src/makefile.win
Просмотреть файл

@ -76,7 +76,7 @@ HASHLIBS=$(BINREL_DIST)\lib\hash.lib $(BINREL_DIST)\lib\secutil.lib
# DEFFILE = $(DLLNAME).def
LLIBS = \
$(DIST)\lib\libplc21.lib \
$(DIST)\lib\plc3.lib \
$(LIBNSPR) \
$(DIST)\lib\js$(MOZ_BITS)$(VERSION_NUMBER).lib \
$(DIST)\lib\xpcom32.lib \

2
modules/libpref/src/xppref16.def
Просмотреть файл

@ -29,7 +29,7 @@ DATA PRELOAD MOVEABLE SINGLE
HEAPSIZE 8192
IMPORTS
_sscanf = nspr21.33
_sscanf = nspr3.33
EXPORTS
_PREF_Init = _PREF_Init

2
modules/libpref/src/xpref16.def
Просмотреть файл

@ -29,7 +29,7 @@ DATA PRELOAD MOVEABLE SINGLE
HEAPSIZE 8192
IMPORTS
_sscanf = nspr21.33
_sscanf = nspr3.33
EXPORTS
_PREF_Init = _PREF_Init

2
modules/libreg/src/makefile.win
Просмотреть файл

@ -72,7 +72,7 @@ LIBRARY= .\$(OBJDIR)\$(LIBNAME).lib
#//------------------------------------------------------------------------
LCFLAGS = $(LCFLAGS)
LLIBS = $(LLIBS) $(LIBNSPR) $(DIST)\lib\libplc21.lib
LLIBS = $(LLIBS) $(LIBNSPR) $(DIST)\lib\plc3.lib
!if "$(MOZ_BITS)"=="32" && defined(MOZ_DEBUG) && defined(GLOWCODE)
LLIBS=$(LLIBS) $(GLOWDIR)\glowcode.lib

5
modules/libreg/standalone/makefile.win
Просмотреть файл

@ -82,13 +82,12 @@ LINCS= $(LINCS) -I$(PUBLIC)/libreg \
#//------------------------------------------------------------------------
include <$(DEPTH)/config/rules.mak>
reg.c::
reg.c:
$(RM) $(DEPTH)\modules\libreg\standalone\reg.h
$(RM) $(DEPTH)\modules\libreg\standalone\reg.c
$(RM) $(DEPTH)\modules\libreg\standalone\vr_stubs.h
$(RM) $(DEPTH)\modules\libreg\standalone\vr_stubs.c
$(RM) $(DEPTH)\modules\libreg\standalone\VerReg.c
copy $(DEPTH)\modules\libreg\src\reg.h $(DEPTH)\modules\libreg\standalone\reg.h
copy $(DEPTH)\modules\libreg\src\reg.c $(DEPTH)\modules\libreg\standalone\reg.c
copy $(DEPTH)\modules\libreg\src\vr_stubs.h $(DEPTH)\modules\libreg\standalone\vr_stubs.h
@ -112,4 +111,4 @@ clobber::
$(RM) $(DEPTH)\modules\libreg\standalone\reg.c
$(RM) $(DEPTH)\modules\libreg\standalone\vr_stubs.h
$(RM) $(DEPTH)\modules\libreg\standalone\vr_stubs.c
$(RM) $(DEPTH)\modules\libreg\standalone\VerReg.c
$(RM) $(DEPTH)\modules\libreg\standalone\VerReg.c

2
modules/oji/src/makefile.win
Просмотреть файл

@ -103,7 +103,7 @@ EXPORTS = jvmmgr.h \
LLIBS = \
$(LIBNSPR) \
$(DIST)\lib\libplc21.lib \
$(DIST)\lib\plc3.lib \
$(DIST)\lib\xpcom32.lib \
$(DIST)\lib\xplib.lib \
$(DIST)\lib\js3250.lib \

2
modules/plugin/base/src/Makefile.in
Просмотреть файл

@ -43,7 +43,7 @@ CPPSRCS = \
nsPluginInstancePeer.cpp \
$(NULL)
REQUIRES = raptor plugin java xpcom netlib libplc21 oji
REQUIRES = raptor plugin java xpcom netlib libplc3 oji
CFLAGS += -D_IMPL_NS_PLUGIN

2
modules/plugin/base/src/makefile.win
Просмотреть файл

@ -67,7 +67,7 @@ CACHELIBNAME=netcache.lib
OURLIBS = \
$(DIST)\lib\xpcom32.lib \
$(DIST)\lib\raptorbase.lib \
$(DIST)\lib\libplc21.lib \
$(DIST)\lib\plc3.lib \
$(DIST)\lib\netlib.lib \
$(DIST)\lib\$(CACHELIBNAME) \
$(DIST)\lib\xppref32.lib \

2
modules/plugin/nglsrc/Makefile.in
Просмотреть файл

@ -43,7 +43,7 @@ CPPSRCS = \
nsPluginInstancePeer.cpp \
$(NULL)
REQUIRES = raptor plugin java xpcom netlib libplc21 oji
REQUIRES = raptor plugin java xpcom netlib libplc3 oji
CFLAGS += -D_IMPL_NS_PLUGIN

2
modules/plugin/nglsrc/makefile.win
Просмотреть файл

@ -67,7 +67,7 @@ CACHELIBNAME=netcache.lib
OURLIBS = \
$(DIST)\lib\xpcom32.lib \
$(DIST)\lib\raptorbase.lib \
$(DIST)\lib\libplc21.lib \
$(DIST)\lib\plc3.lib \
$(DIST)\lib\netlib.lib \
$(DIST)\lib\$(CACHELIBNAME) \
$(DIST)\lib\xppref32.lib \

24
modules/zlib/src/zip16.def
Просмотреть файл

@ -1,24 +0,0 @@
LIBRARY zip1640.DLL
EXETYPE WINDOWS
PROTMODE
DESCRIPTION '16-bit Zip DLL'
STUB 'WINSTUB.EXE'
CODE LOADONCALL MOVEABLE DISCARDABLE
DATA PRELOAD MOVEABLE SINGLE
HEAPSIZE 8192
EXPORTS
IMPORTS
_malloc = nspr21.2
_realloc = nspr21.3
_calloc = nspr21.4
_free = nspr21.5
_getenv = nspr21.9
_printf = nspr21.11
_sscanf = nspr21.33

4
network/cache/nu/src/Makefile.in поставляемый
Просмотреть файл

@ -29,7 +29,7 @@ LIBRARY_NAME=cache
MISCDEP = \
$(NSPR_LIBS) \
$(DIST)/lib/dbm32.lib \
$(DIST)/lib/libplc21.lib \
$(DIST)/lib/plc3.lib \
$(DIST)/lib/xpcom32.lib \
$(DIST)/lib/libpref.lib \
$(NULL)
@ -56,7 +56,7 @@ REQUIRES = dbm pref js xpcom
LLIBS = \
$(DIST)/lib/dbm32.lib \
$(DIST)/lib/libplc21.lib \
$(DIST)/lib/plc3.lib \
$(DIST)/lib/xpcom32.lib \
$(DIST)/lib/libpref.lib \
$(NSPR_LIBS) \

4
network/cache/nu/src/makefile.win поставляемый
Просмотреть файл

@ -26,11 +26,11 @@ DLLNAME = cache
LIBRARY_NAME=cache
#
# Remember to change libplc21 to $whatever it is...
# Remember to change libplc3 to $whatever it is...
#
LLIBS = \
$(LIBNSPR) \
$(DIST)\lib\libplc21.lib \
$(DIST)\lib\plc3.lib \
$(DIST)\lib\dbm32.lib \
$(DIST)\lib\xpcom32.lib \
$(DIST)\lib\libpref.lib \

526
network/cache/nu/tests/cb/cb.mak поставляемый
Просмотреть файл

@ -1,526 +0,0 @@
# Microsoft Developer Studio Generated NMAKE File, Format Version 4.20
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Application" 0x0101
!IF "$(CFG)" == ""
CFG=cb - Win32 Debug
!MESSAGE No configuration specified. Defaulting to cb - Win32 Debug.
!ENDIF
!IF "$(CFG)" != "cb - Win32 Release" && "$(CFG)" != "cb - Win32 Debug"
!MESSAGE Invalid configuration "$(CFG)" specified.
!MESSAGE You can specify a configuration when running NMAKE on this makefile
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "cb.mak" CFG="cb - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE "cb - Win32 Release" (based on "Win32 (x86) Application")
!MESSAGE "cb - Win32 Debug" (based on "Win32 (x86) Application")
!MESSAGE
!ERROR An invalid configuration is specified.
!ENDIF
!IF "$(OS)" == "Windows_NT"
NULL=
!ELSE
NULL=nul
!ENDIF
################################################################################
# Begin Project
# PROP Target_Last_Scanned "cb - Win32 Debug"
CPP=cl.exe
RSC=rc.exe
MTL=mktyplib.exe
!IF "$(CFG)" == "cb - Win32 Release"
# PROP BASE Use_MFC 6
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "Release"
# PROP BASE Intermediate_Dir "Release"
# PROP BASE Target_Dir ""
# PROP Use_MFC 6
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "Release"
# PROP Intermediate_Dir "Release"
# PROP Target_Dir ""
OUTDIR=.\Release
INTDIR=.\Release
ALL : "$(OUTDIR)\cb.exe"
CLEAN :
-@erase "$(INTDIR)\CacheTreeView.obj"
-@erase "$(INTDIR)\cb.obj"
-@erase "$(INTDIR)\cb.pch"
-@erase "$(INTDIR)\cb.res"
-@erase "$(INTDIR)\cbDoc.obj"
-@erase "$(INTDIR)\cbView.obj"
-@erase "$(INTDIR)\MainFrm.obj"
-@erase "$(INTDIR)\StdAfx.obj"
-@erase "$(OUTDIR)\cb.exe"
"$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
# ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_AFXDLL" /D "_MBCS" /Yu"stdafx.h" /c
# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\..\..\dist\public\cache" /I "..\..\..\..\..\dist\win32_d.obj\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_AFXDLL" /D "_MBCS" /Yu"stdafx.h" /c
CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\..\..\..\..\dist\public\cache" /I\
"..\..\..\..\..\dist\win32_d.obj\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS"\
/D "_AFXDLL" /D "_MBCS" /Fp"$(INTDIR)/cb.pch" /Yu"stdafx.h" /Fo"$(INTDIR)/" /c
CPP_OBJS=.\Release/
CPP_SBRS=.\.
# ADD BASE MTL /nologo /D "NDEBUG" /win32
# ADD MTL /nologo /D "NDEBUG" /win32
MTL_PROJ=/nologo /D "NDEBUG" /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG" /d "_AFXDLL"
# ADD RSC /l 0x409 /d "NDEBUG" /d "_AFXDLL"
RSC_PROJ=/l 0x409 /fo"$(INTDIR)/cb.res" /d "NDEBUG" /d "_AFXDLL"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
BSC32_FLAGS=/nologo /o"$(OUTDIR)/cb.bsc"
BSC32_SBRS= \
LINK32=link.exe
# ADD BASE LINK32 /nologo /subsystem:windows /machine:I386
# ADD LINK32 /nologo /subsystem:windows /machine:I386
LINK32_FLAGS=/nologo /subsystem:windows /incremental:no /pdb:"$(OUTDIR)/cb.pdb"\
/machine:I386 /out:"$(OUTDIR)/cb.exe"
LINK32_OBJS= \
"$(INTDIR)\CacheTreeView.obj" \
"$(INTDIR)\cb.obj" \
"$(INTDIR)\cb.res" \
"$(INTDIR)\cbDoc.obj" \
"$(INTDIR)\cbView.obj" \
"$(INTDIR)\MainFrm.obj" \
"$(INTDIR)\StdAfx.obj"
"$(OUTDIR)\cb.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
$(LINK32) @<<
$(LINK32_FLAGS) $(LINK32_OBJS)
<<
!ELSEIF "$(CFG)" == "cb - Win32 Debug"
# PROP BASE Use_MFC 6
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "Debug"
# PROP BASE Intermediate_Dir "Debug"
# PROP BASE Target_Dir ""
# PROP Use_MFC 6
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "Debug"
# PROP Intermediate_Dir "Debug"
# PROP Target_Dir ""
OUTDIR=.\Debug
INTDIR=.\Debug
ALL : "$(OUTDIR)\cb.exe" "$(OUTDIR)\cb.bsc"
CLEAN :
-@erase "$(INTDIR)\CacheTreeView.obj"
-@erase "$(INTDIR)\CacheTreeView.sbr"
-@erase "$(INTDIR)\cb.obj"
-@erase "$(INTDIR)\cb.pch"
-@erase "$(INTDIR)\cb.res"
-@erase "$(INTDIR)\cb.sbr"
-@erase "$(INTDIR)\cbDoc.obj"
-@erase "$(INTDIR)\cbDoc.sbr"
-@erase "$(INTDIR)\cbView.obj"
-@erase "$(INTDIR)\cbView.sbr"
-@erase "$(INTDIR)\MainFrm.obj"
-@erase "$(INTDIR)\MainFrm.sbr"
-@erase "$(INTDIR)\StdAfx.obj"
-@erase "$(INTDIR)\StdAfx.sbr"
-@erase "$(INTDIR)\vc40.idb"
-@erase "$(INTDIR)\vc40.pdb"
-@erase "$(OUTDIR)\cb.bsc"
-@erase "$(OUTDIR)\cb.exe"
-@erase "$(OUTDIR)\cb.ilk"
-@erase "$(OUTDIR)\cb.pdb"
"$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_AFXDLL" /D "_MBCS" /Yu"stdafx.h" /c
# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\..\..\dist\public\cache" /I "..\..\..\..\..\dist\win32_d.obj\include" /I "..\..\..\..\..\dist\public\dbm" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_AFXDLL" /D "_MBCS" /FR /Yu"stdafx.h" /V"ERBOSE:lib" /c
CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\..\..\dist\public\cache"\
/I "..\..\..\..\..\dist\win32_d.obj\include" /I\
"..\..\..\..\..\dist\public\dbm" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D\
"_AFXDLL" /D "_MBCS" /FR"$(INTDIR)/" /Fp"$(INTDIR)/cb.pch" /Yu"stdafx.h"\
/Fo"$(INTDIR)/" /Fd"$(INTDIR)/" /V"ERBOSE:lib" /c
CPP_OBJS=.\Debug/
CPP_SBRS=.\Debug/
# ADD BASE MTL /nologo /D "_DEBUG" /win32
# ADD MTL /nologo /D "_DEBUG" /win32
MTL_PROJ=/nologo /D "_DEBUG" /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "_AFXDLL"
# ADD RSC /l 0x409 /d "_DEBUG" /d "_AFXDLL"
RSC_PROJ=/l 0x409 /fo"$(INTDIR)/cb.res" /d "_DEBUG" /d "_AFXDLL"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
BSC32_FLAGS=/nologo /o"$(OUTDIR)/cb.bsc"
BSC32_SBRS= \
"$(INTDIR)\CacheTreeView.sbr" \
"$(INTDIR)\cb.sbr" \
"$(INTDIR)\cbDoc.sbr" \
"$(INTDIR)\cbView.sbr" \
"$(INTDIR)\MainFrm.sbr" \
"$(INTDIR)\StdAfx.sbr"
"$(OUTDIR)\cb.bsc" : "$(OUTDIR)" $(BSC32_SBRS)
$(BSC32) @<<
$(BSC32_FLAGS) $(BSC32_SBRS)
<<
LINK32=link.exe
# ADD BASE LINK32 /nologo /subsystem:windows /debug /machine:I386
# ADD LINK32 ..\..\..\..\..\dist\win32_d.obj\lib\libnspr21.lib ..\..\..\..\..\dist\win32_d.obj\lib\libplc21.lib ..\..\..\..\..\dist\win32_d.obj\lib\dbm32.lib ..\..\..\..\..\dist\win32_d.obj\lib\cachelib.lib /nologo /subsystem:windows /debug /machine:I386
# SUBTRACT LINK32 /nodefaultlib
LINK32_FLAGS=..\..\..\..\..\dist\win32_d.obj\lib\libnspr21.lib\
..\..\..\..\..\dist\win32_d.obj\lib\libplc21.lib\
..\..\..\..\..\dist\win32_d.obj\lib\dbm32.lib\
..\..\..\..\..\dist\win32_d.obj\lib\cachelib.lib /nologo /subsystem:windows\
/incremental:yes /pdb:"$(OUTDIR)/cb.pdb" /debug /machine:I386\
/out:"$(OUTDIR)/cb.exe"
LINK32_OBJS= \
"$(INTDIR)\CacheTreeView.obj" \
"$(INTDIR)\cb.obj" \
"$(INTDIR)\cb.res" \
"$(INTDIR)\cbDoc.obj" \
"$(INTDIR)\cbView.obj" \
"$(INTDIR)\MainFrm.obj" \
"$(INTDIR)\StdAfx.obj"
"$(OUTDIR)\cb.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
$(LINK32) @<<
$(LINK32_FLAGS) $(LINK32_OBJS)
<<
!ENDIF
.c{$(CPP_OBJS)}.obj:
$(CPP) $(CPP_PROJ) $<
.cpp{$(CPP_OBJS)}.obj:
$(CPP) $(CPP_PROJ) $<
.cxx{$(CPP_OBJS)}.obj:
$(CPP) $(CPP_PROJ) $<
.c{$(CPP_SBRS)}.sbr:
$(CPP) $(CPP_PROJ) $<
.cpp{$(CPP_SBRS)}.sbr:
$(CPP) $(CPP_PROJ) $<
.cxx{$(CPP_SBRS)}.sbr:
$(CPP) $(CPP_PROJ) $<
################################################################################
# Begin Target
# Name "cb - Win32 Release"
# Name "cb - Win32 Debug"
!IF "$(CFG)" == "cb - Win32 Release"
!ELSEIF "$(CFG)" == "cb - Win32 Debug"
!ENDIF
################################################################################
# Begin Source File
SOURCE=.\cb.cpp
DEP_CPP_CB_CP=\
".\cb.h"\
".\cbDoc.h"\
".\cbView.h"\
".\MainFrm.h"\
".\StdAfx.h"\
!IF "$(CFG)" == "cb - Win32 Release"
"$(INTDIR)\cb.obj" : $(SOURCE) $(DEP_CPP_CB_CP) "$(INTDIR)" "$(INTDIR)\cb.pch"
!ELSEIF "$(CFG)" == "cb - Win32 Debug"
"$(INTDIR)\cb.obj" : $(SOURCE) $(DEP_CPP_CB_CP) "$(INTDIR)" "$(INTDIR)\cb.pch"
"$(INTDIR)\cb.sbr" : $(SOURCE) $(DEP_CPP_CB_CP) "$(INTDIR)" "$(INTDIR)\cb.pch"
!ENDIF
# End Source File
################################################################################
# Begin Source File
SOURCE=.\StdAfx.cpp
DEP_CPP_STDAF=\
".\StdAfx.h"\
!IF "$(CFG)" == "cb - Win32 Release"
# ADD CPP /Yc"stdafx.h"
BuildCmds= \
$(CPP) /nologo /MD /W3 /GX /O2 /I "..\..\..\..\..\dist\public\cache" /I\
"..\..\..\..\..\dist\win32_d.obj\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS"\
/D "_AFXDLL" /D "_MBCS" /Fp"$(INTDIR)/cb.pch" /Yc"stdafx.h" /Fo"$(INTDIR)/" /c\
$(SOURCE) \
"$(INTDIR)\StdAfx.obj" : $(SOURCE) $(DEP_CPP_STDAF) "$(INTDIR)"
$(BuildCmds)
"$(INTDIR)\cb.pch" : $(SOURCE) $(DEP_CPP_STDAF) "$(INTDIR)"
$(BuildCmds)
!ELSEIF "$(CFG)" == "cb - Win32 Debug"
# ADD CPP /Yc"stdafx.h"
BuildCmds= \
$(CPP) /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\..\..\dist\public\cache"\
/I "..\..\..\..\..\dist\win32_d.obj\include" /I\
"..\..\..\..\..\dist\public\dbm" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D\
"_AFXDLL" /D "_MBCS" /FR"$(INTDIR)/" /Fp"$(INTDIR)/cb.pch" /Yc"stdafx.h"\
/Fo"$(INTDIR)/" /Fd"$(INTDIR)/" /V"ERBOSE:lib" /c $(SOURCE) \
"$(INTDIR)\StdAfx.obj" : $(SOURCE) $(DEP_CPP_STDAF) "$(INTDIR)"
$(BuildCmds)
"$(INTDIR)\StdAfx.sbr" : $(SOURCE) $(DEP_CPP_STDAF) "$(INTDIR)"
$(BuildCmds)
"$(INTDIR)\cb.pch" : $(SOURCE) $(DEP_CPP_STDAF) "$(INTDIR)"
$(BuildCmds)
!ENDIF
# End Source File
################################################################################
# Begin Source File
SOURCE=.\MainFrm.cpp
DEP_CPP_MAINF=\
".\CacheTreeView.h"\
".\cb.h"\
".\MainFrm.h"\
".\StdAfx.h"\
!IF "$(CFG)" == "cb - Win32 Release"
"$(INTDIR)\MainFrm.obj" : $(SOURCE) $(DEP_CPP_MAINF) "$(INTDIR)"\
"$(INTDIR)\cb.pch"
!ELSEIF "$(CFG)" == "cb - Win32 Debug"
"$(INTDIR)\MainFrm.obj" : $(SOURCE) $(DEP_CPP_MAINF) "$(INTDIR)"\
"$(INTDIR)\cb.pch"
"$(INTDIR)\MainFrm.sbr" : $(SOURCE) $(DEP_CPP_MAINF) "$(INTDIR)"\
"$(INTDIR)\cb.pch"
!ENDIF
# End Source File
################################################################################
# Begin Source File
SOURCE=.\cbDoc.cpp
DEP_CPP_CBDOC=\
".\CacheTreeView.h"\
".\cb.h"\
".\cbDoc.h"\
".\StdAfx.h"\
!IF "$(CFG)" == "cb - Win32 Release"
"$(INTDIR)\cbDoc.obj" : $(SOURCE) $(DEP_CPP_CBDOC) "$(INTDIR)"\
"$(INTDIR)\cb.pch"
!ELSEIF "$(CFG)" == "cb - Win32 Debug"
"$(INTDIR)\cbDoc.obj" : $(SOURCE) $(DEP_CPP_CBDOC) "$(INTDIR)"\
"$(INTDIR)\cb.pch"
"$(INTDIR)\cbDoc.sbr" : $(SOURCE) $(DEP_CPP_CBDOC) "$(INTDIR)"\
"$(INTDIR)\cb.pch"
!ENDIF
# End Source File
################################################################################
# Begin Source File
SOURCE=.\cbView.cpp
!IF "$(CFG)" == "cb - Win32 Release"
DEP_CPP_CBVIE=\
"..\..\..\..\..\dist\public\cache\nsBkgThread.h"\
"..\..\..\..\..\dist\public\cache\nsCacheBkgThd.h"\
"..\..\..\..\..\dist\public\cache\nsCacheManager.h"\
"..\..\..\..\..\dist\public\cache\nsCacheModule.h"\
"..\..\..\..\..\dist\public\cache\nsCacheObject.h"\
"..\..\..\..\..\dist\public\cache\nsCachePref.h"\
"..\..\..\..\..\dist\public\cache\nsDiskModule.h"\
"..\..\..\..\..\dist\public\cache\nsEnumeration.h"\
"..\..\..\..\..\dist\public\cache\nsIterator.h"\
"..\..\..\..\..\dist\public\cache\nsMemCacheObject.h"\
"..\..\..\..\..\dist\public\cache\nsMemModule.h"\
"..\..\..\..\..\dist\public\cache\nsMemStream.h"\
"..\..\..\..\..\dist\public\cache\nsMonitorable.h"\
"..\..\..\..\..\dist\public\cache\nsStream.h"\
"..\..\..\..\..\dist\win32_d.obj\include\obsolete\protypes.h"\
"..\..\..\..\..\dist\win32_d.obj\include\prcpucfg.h"\
"..\..\..\..\..\dist\win32_d.obj\include\prinrval.h"\
"..\..\..\..\..\dist\win32_d.obj\include\prlog.h"\
"..\..\..\..\..\dist\win32_d.obj\include\prmon.h"\
"..\..\..\..\..\dist\win32_d.obj\include\prthread.h"\
"..\..\..\..\..\dist\win32_d.obj\include\prtypes.h"\
".\cb.h"\
".\cbDoc.h"\
".\cbView.h"\
".\MainFrm.h"\
".\nsTimeIt.h"\
".\StdAfx.h"\
{$(INCLUDE)}"\sys\TYPES.H"\
NODEP_CPP_CBVIE=\
"..\..\..\..\..\dist\public\cache\mcom_db.h"\
"..\..\..\..\..\dist\public\cache\nsISupports.h"\
"..\..\..\..\..\dist\win32_d.obj\include\protypes.h"\
"$(INTDIR)\cbView.obj" : $(SOURCE) $(DEP_CPP_CBVIE) "$(INTDIR)"\
"$(INTDIR)\cb.pch"
!ELSEIF "$(CFG)" == "cb - Win32 Debug"
DEP_CPP_CBVIE=\
"..\..\..\..\..\dist\public\cache\nsBkgThread.h"\
"..\..\..\..\..\dist\public\cache\nsCacheBkgThd.h"\
"..\..\..\..\..\dist\public\cache\nsCacheManager.h"\
"..\..\..\..\..\dist\public\cache\nsCacheModule.h"\
"..\..\..\..\..\dist\public\cache\nsCacheObject.h"\
"..\..\..\..\..\dist\public\cache\nsCachePref.h"\
"..\..\..\..\..\dist\public\cache\nsDiskModule.h"\
"..\..\..\..\..\dist\public\cache\nsEnumeration.h"\
"..\..\..\..\..\dist\public\cache\nsIterator.h"\
"..\..\..\..\..\dist\public\cache\nsMemCacheObject.h"\
"..\..\..\..\..\dist\public\cache\nsMemModule.h"\
"..\..\..\..\..\dist\public\cache\nsMemStream.h"\
"..\..\..\..\..\dist\public\cache\nsMonitorable.h"\
"..\..\..\..\..\dist\public\cache\nsStream.h"\
"..\..\..\..\..\dist\public\dbm\cdefs.h"\
"..\..\..\..\..\dist\public\dbm\mcom_db.h"\
"..\..\..\..\..\dist\win32_d.obj\include\obsolete\protypes.h"\
"..\..\..\..\..\dist\win32_d.obj\include\prcpucfg.h"\
"..\..\..\..\..\dist\win32_d.obj\include\prinrval.h"\
"..\..\..\..\..\dist\win32_d.obj\include\prlog.h"\
"..\..\..\..\..\dist\win32_d.obj\include\prmon.h"\
"..\..\..\..\..\dist\win32_d.obj\include\prthread.h"\
"..\..\..\..\..\dist\win32_d.obj\include\prtypes.h"\
".\cb.h"\
".\cbDoc.h"\
".\cbView.h"\
".\MainFrm.h"\
".\nsTimeIt.h"\
".\StdAfx.h"\
{$(INCLUDE)}"\sys\STAT.H"\
{$(INCLUDE)}"\sys\TYPES.H"\
NODEP_CPP_CBVIE=\
"..\..\..\..\..\dist\public\cache\nsISupports.h"\
"..\..\..\..\..\dist\public\dbm\prmacos.h"\
"..\..\..\..\..\dist\public\dbm\xp_mcom.h"\
"..\..\..\..\..\dist\win32_d.obj\include\protypes.h"\
"$(INTDIR)\cbView.obj" : $(SOURCE) $(DEP_CPP_CBVIE) "$(INTDIR)"\
"$(INTDIR)\cb.pch"
"$(INTDIR)\cbView.sbr" : $(SOURCE) $(DEP_CPP_CBVIE) "$(INTDIR)"\
"$(INTDIR)\cb.pch"
!ENDIF
# End Source File
################################################################################
# Begin Source File
SOURCE=.\cb.rc
DEP_RSC_CB_RC=\
".\res\cacheico.bmp"\
".\res\cb.ico"\
".\res\cb.rc2"\
".\res\cbDoc.ico"\
".\res\Toolbar.bmp"\
"$(INTDIR)\cb.res" : $(SOURCE) $(DEP_RSC_CB_RC) "$(INTDIR)"
$(RSC) $(RSC_PROJ) $(SOURCE)
# End Source File
################################################################################
# Begin Source File
SOURCE=.\CacheTreeView.cpp
DEP_CPP_CACHE=\
".\CacheTreeView.h"\
".\cb.h"\
".\cbDoc.h"\
".\StdAfx.h"\
!IF "$(CFG)" == "cb - Win32 Release"
"$(INTDIR)\CacheTreeView.obj" : $(SOURCE) $(DEP_CPP_CACHE) "$(INTDIR)"\
"$(INTDIR)\cb.pch"
!ELSEIF "$(CFG)" == "cb - Win32 Debug"
"$(INTDIR)\CacheTreeView.obj" : $(SOURCE) $(DEP_CPP_CACHE) "$(INTDIR)"\
"$(INTDIR)\cb.pch"
"$(INTDIR)\CacheTreeView.sbr" : $(SOURCE) $(DEP_CPP_CACHE) "$(INTDIR)"\
"$(INTDIR)\cb.pch"
!ENDIF
# End Source File
# End Target
# End Project
################################################################################

329
network/cache/nu/tests/fftest/fftest.mak поставляемый
Просмотреть файл

@ -1,329 +0,0 @@
# Microsoft Developer Studio Generated NMAKE File, Format Version 4.20
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Console Application" 0x0103
!IF "$(CFG)" == ""
CFG=fftest - Win32 Debug
!MESSAGE No configuration specified. Defaulting to fftest - Win32 Debug.
!ENDIF
!IF "$(CFG)" != "fftest - Win32 Release" && "$(CFG)" != "fftest - Win32 Debug"
!MESSAGE Invalid configuration "$(CFG)" specified.
!MESSAGE You can specify a configuration when running NMAKE on this makefile
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "fftest.mak" CFG="fftest - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE "fftest - Win32 Release" (based on "Win32 (x86) Console Application")
!MESSAGE "fftest - Win32 Debug" (based on "Win32 (x86) Console Application")
!MESSAGE
!ERROR An invalid configuration is specified.
!ENDIF
!IF "$(OS)" == "Windows_NT"
NULL=
!ELSE
NULL=nul
!ENDIF
################################################################################
# Begin Project
# PROP Target_Last_Scanned "fftest - Win32 Debug"
CPP=cl.exe
RSC=rc.exe
!IF "$(CFG)" == "fftest - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "Release"
# PROP BASE Intermediate_Dir "Release"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "Release"
# PROP Intermediate_Dir "Release"
# PROP Target_Dir ""
OUTDIR=.\Release
INTDIR=.\Release
ALL : "$(OUTDIR)\fftest.exe"
CLEAN :
-@erase "$(INTDIR)\FlatFileTest.obj"
-@erase "$(INTDIR)\nsFFEntry.obj"
-@erase "$(INTDIR)\nsFFObject.obj"
-@erase "$(INTDIR)\nsFlatFile.obj"
-@erase "$(INTDIR)\nsTOC.obj"
-@erase "$(OUTDIR)\fftest.exe"
"$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
# ADD CPP /nologo /W4 /GX /O2 /I "..\..\..\..\..\dist\win32_d.obj\include" /I "..\..\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
CPP_PROJ=/nologo /ML /W4 /GX /O2 /I "..\..\..\..\..\dist\win32_d.obj\include"\
/I "..\..\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE"\
/Fp"$(INTDIR)/fftest.pch" /YX /Fo"$(INTDIR)/" /c
CPP_OBJS=.\Release/
CPP_SBRS=.\.
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
BSC32_FLAGS=/nologo /o"$(OUTDIR)/fftest.bsc"
BSC32_SBRS= \
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
# ADD LINK32 ..\..\..\..\..\dist\win32_d.obj\lib\libnspr21.lib ..\..\..\..\..\dist\win32_d.obj\lib\libplc21.lib /nologo /subsystem:console /machine:I386
LINK32_FLAGS=..\..\..\..\..\dist\win32_d.obj\lib\libnspr21.lib\
..\..\..\..\..\dist\win32_d.obj\lib\libplc21.lib /nologo /subsystem:console\
/incremental:no /pdb:"$(OUTDIR)/fftest.pdb" /machine:I386\
/out:"$(OUTDIR)/fftest.exe"
LINK32_OBJS= \
"$(INTDIR)\FlatFileTest.obj" \
"$(INTDIR)\nsFFEntry.obj" \
"$(INTDIR)\nsFFObject.obj" \
"$(INTDIR)\nsFlatFile.obj" \
"$(INTDIR)\nsTOC.obj"
"$(OUTDIR)\fftest.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
$(LINK32) @<<
$(LINK32_FLAGS) $(LINK32_OBJS)
<<
!ELSEIF "$(CFG)" == "fftest - Win32 Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "Debug"
# PROP BASE Intermediate_Dir "Debug"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "Debug"
# PROP Intermediate_Dir "Debug"
# PROP Target_Dir ""
OUTDIR=.\Debug
INTDIR=.\Debug
ALL : "$(OUTDIR)\fftest.exe"
CLEAN :
-@erase "$(INTDIR)\FlatFileTest.obj"
-@erase "$(INTDIR)\nsFFEntry.obj"
-@erase "$(INTDIR)\nsFFObject.obj"
-@erase "$(INTDIR)\nsFlatFile.obj"
-@erase "$(INTDIR)\nsTOC.obj"
-@erase "$(INTDIR)\vc40.idb"
-@erase "$(INTDIR)\vc40.pdb"
-@erase "$(OUTDIR)\fftest.exe"
-@erase "$(OUTDIR)\fftest.ilk"
-@erase "$(OUTDIR)\fftest.pdb"
"$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
# ADD CPP /nologo /W4 /Gm /GX /Zi /Od /I "..\..\..\..\..\dist\win32_d.obj\include" /I "..\..\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
CPP_PROJ=/nologo /MLd /W4 /Gm /GX /Zi /Od /I\
"..\..\..\..\..\dist\win32_d.obj\include" /I "..\..\include" /D "WIN32" /D\
"_DEBUG" /D "_CONSOLE" /Fp"$(INTDIR)/fftest.pch" /YX /Fo"$(INTDIR)/"\
/Fd"$(INTDIR)/" /c
CPP_OBJS=.\Debug/
CPP_SBRS=.\.
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
BSC32_FLAGS=/nologo /o"$(OUTDIR)/fftest.bsc"
BSC32_SBRS= \
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386
# ADD LINK32 ..\..\..\..\..\dist\win32_d.obj\lib\libnspr21.lib ..\..\..\..\..\dist\win32_d.obj\lib\libplc21.lib /nologo /subsystem:console /debug /machine:I386
LINK32_FLAGS=..\..\..\..\..\dist\win32_d.obj\lib\libnspr21.lib\
..\..\..\..\..\dist\win32_d.obj\lib\libplc21.lib /nologo /subsystem:console\
/incremental:yes /pdb:"$(OUTDIR)/fftest.pdb" /debug /machine:I386\
/out:"$(OUTDIR)/fftest.exe"
LINK32_OBJS= \
"$(INTDIR)\FlatFileTest.obj" \
"$(INTDIR)\nsFFEntry.obj" \
"$(INTDIR)\nsFFObject.obj" \
"$(INTDIR)\nsFlatFile.obj" \
"$(INTDIR)\nsTOC.obj"
"$(OUTDIR)\fftest.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
$(LINK32) @<<
$(LINK32_FLAGS) $(LINK32_OBJS)
<<
!ENDIF
.c{$(CPP_OBJS)}.obj:
$(CPP) $(CPP_PROJ) $<
.cpp{$(CPP_OBJS)}.obj:
$(CPP) $(CPP_PROJ) $<
.cxx{$(CPP_OBJS)}.obj:
$(CPP) $(CPP_PROJ) $<
.c{$(CPP_SBRS)}.sbr:
$(CPP) $(CPP_PROJ) $<
.cpp{$(CPP_SBRS)}.sbr:
$(CPP) $(CPP_PROJ) $<
.cxx{$(CPP_SBRS)}.sbr:
$(CPP) $(CPP_PROJ) $<
################################################################################
# Begin Target
# Name "fftest - Win32 Release"
# Name "fftest - Win32 Debug"
!IF "$(CFG)" == "fftest - Win32 Release"
!ELSEIF "$(CFG)" == "fftest - Win32 Debug"
!ENDIF
################################################################################
# Begin Source File
SOURCE=.\FlatFileTest.cpp
DEP_CPP_FLATF=\
"..\..\..\..\..\dist\win32_d.obj\include\obsolete\protypes.h"\
"..\..\..\..\..\dist\win32_d.obj\include\plstr.h"\
"..\..\..\..\..\dist\win32_d.obj\include\prcpucfg.h"\
"..\..\..\..\..\dist\win32_d.obj\include\prinet.h"\
"..\..\..\..\..\dist\win32_d.obj\include\prinrval.h"\
"..\..\..\..\..\dist\win32_d.obj\include\prio.h"\
"..\..\..\..\..\dist\win32_d.obj\include\prlong.h"\
"..\..\..\..\..\dist\win32_d.obj\include\prtime.h"\
"..\..\..\..\..\dist\win32_d.obj\include\prtypes.h"\
"..\..\include\nsFFEntry.h"\
"..\..\include\nsFFObject.h"\
"..\..\include\nsFlatFile.h"\
"..\..\include\nsTOC.h"\
{$(INCLUDE)}"\sys\types.h"\
NODEP_CPP_FLATF=\
"..\..\..\..\..\dist\win32_d.obj\include\macsocket.h"\
"..\..\..\..\..\dist\win32_d.obj\include\protypes.h"\
"$(INTDIR)\FlatFileTest.obj" : $(SOURCE) $(DEP_CPP_FLATF) "$(INTDIR)"
# End Source File
################################################################################
# Begin Source File
SOURCE=\work\mozilla\network\cache\nu\src\nsFlatFile.cpp
DEP_CPP_NSFLA=\
"..\..\..\..\..\dist\win32_d.obj\include\obsolete\protypes.h"\
"..\..\..\..\..\dist\win32_d.obj\include\plstr.h"\
"..\..\..\..\..\dist\win32_d.obj\include\prcpucfg.h"\
"..\..\..\..\..\dist\win32_d.obj\include\prinet.h"\
"..\..\..\..\..\dist\win32_d.obj\include\prinrval.h"\
"..\..\..\..\..\dist\win32_d.obj\include\prio.h"\
"..\..\..\..\..\dist\win32_d.obj\include\prlong.h"\
"..\..\..\..\..\dist\win32_d.obj\include\prmem.h"\
"..\..\..\..\..\dist\win32_d.obj\include\prtime.h"\
"..\..\..\..\..\dist\win32_d.obj\include\prtypes.h"\
"..\..\include\nsFlatFile.h"\
{$(INCLUDE)}"\sys\types.h"\
NODEP_CPP_NSFLA=\
"..\..\..\..\..\dist\win32_d.obj\include\macsocket.h"\
"..\..\..\..\..\dist\win32_d.obj\include\protypes.h"\
"$(INTDIR)\nsFlatFile.obj" : $(SOURCE) $(DEP_CPP_NSFLA) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
# End Source File
################################################################################
# Begin Source File
SOURCE=\work\mozilla\network\cache\nu\src\nsFFObject.cpp
DEP_CPP_NSFFO=\
"..\..\..\..\..\dist\win32_d.obj\include\obsolete\protypes.h"\
"..\..\..\..\..\dist\win32_d.obj\include\prcpucfg.h"\
"..\..\..\..\..\dist\win32_d.obj\include\prtypes.h"\
"..\..\include\nsFFObject.h"\
NODEP_CPP_NSFFO=\
"..\..\..\..\..\dist\win32_d.obj\include\protypes.h"\
"$(INTDIR)\nsFFObject.obj" : $(SOURCE) $(DEP_CPP_NSFFO) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
# End Source File
################################################################################
# Begin Source File
SOURCE=\work\mozilla\network\cache\nu\src\nsTOC.cpp
DEP_CPP_NSTOC=\
"..\..\..\..\..\dist\win32_d.obj\include\obsolete\protypes.h"\
"..\..\..\..\..\dist\win32_d.obj\include\plstr.h"\
"..\..\..\..\..\dist\win32_d.obj\include\prcpucfg.h"\
"..\..\..\..\..\dist\win32_d.obj\include\prinet.h"\
"..\..\..\..\..\dist\win32_d.obj\include\prinrval.h"\
"..\..\..\..\..\dist\win32_d.obj\include\prio.h"\
"..\..\..\..\..\dist\win32_d.obj\include\prlog.h"\
"..\..\..\..\..\dist\win32_d.obj\include\prlong.h"\
"..\..\..\..\..\dist\win32_d.obj\include\prtime.h"\
"..\..\..\..\..\dist\win32_d.obj\include\prtypes.h"\
"..\..\include\nsFFEntry.h"\
"..\..\include\nsFFObject.h"\
"..\..\include\nsFlatFile.h"\
"..\..\include\nsTOC.h"\
{$(INCLUDE)}"\sys\types.h"\
NODEP_CPP_NSTOC=\
"..\..\..\..\..\dist\win32_d.obj\include\macsocket.h"\
"..\..\..\..\..\dist\win32_d.obj\include\protypes.h"\
"$(INTDIR)\nsTOC.obj" : $(SOURCE) $(DEP_CPP_NSTOC) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
# End Source File
################################################################################
# Begin Source File
SOURCE=\work\mozilla\network\cache\nu\src\nsFFEntry.cpp
DEP_CPP_NSFFE=\
"..\..\..\..\..\dist\win32_d.obj\include\obsolete\protypes.h"\
"..\..\..\..\..\dist\win32_d.obj\include\prcpucfg.h"\
"..\..\..\..\..\dist\win32_d.obj\include\prlog.h"\
"..\..\..\..\..\dist\win32_d.obj\include\prmem.h"\
"..\..\..\..\..\dist\win32_d.obj\include\prtypes.h"\
"..\..\include\nsFFEntry.h"\
"..\..\include\nsFFObject.h"\
NODEP_CPP_NSFFE=\
"..\..\..\..\..\dist\win32_d.obj\include\protypes.h"\
"$(INTDIR)\nsFFEntry.obj" : $(SOURCE) $(DEP_CPP_NSFFE) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
# End Source File
# End Target
# End Project
################################################################################

2
network/module/makefile.win
Просмотреть файл

@ -116,7 +116,7 @@ NETLIBS=\
LLIBS=$(LLIBS) $(LIBNSPR) \
$(DIST)\lib\secfreenav32.lib \
$(DIST)\lib\libpwcac.lib \
$(DIST)\lib\libplc21.lib \
$(DIST)\lib\plc3.lib \
$(DIST)\lib\js32$(VERSION_NUMBER).lib \
$(DIST)\lib\xppref32.lib \
$(DIST)\lib\xpcom32.lib \

2
network/module/tests/makefile.win
Просмотреть файл

@ -74,7 +74,7 @@ LLIBS=$(LLIBS) \
$(DIST)\lib\xpcom32.lib \
$(DIST)\lib\netlib.lib \
$(DIST)\lib\raptorbase.lib \
$(DIST)\lib\libplc21.lib
$(DIST)\lib\plc3.lib
LINCS=$(LINCS) -I. \
-I$(PUBLIC)\raptor \

1
network/module/tests/transportTest.cpp
Просмотреть файл

@ -311,7 +311,6 @@ int main()
nsresult result;
int i;
PL_InitializeEventsLib("");
nsComponentManager::RegisterComponent(kNetServiceCID, NULL, NULL, NETLIB_DLL, PR_FALSE, PR_FALSE);
nsComponentManager::RegisterComponent(kEventQueueServiceCID, NULL, NULL, XPCOM_DLL, PR_FALSE, PR_FALSE);

2
parser/htmlparser/robot/makefile.win
Просмотреть файл

@ -26,7 +26,7 @@ LLIBS= \
$(DIST)\lib\raptorbase.lib \
$(DIST)\lib\xpcom32.lib \
$(LIBNSPR) \
$(DIST)\lib\libplc21.lib \
$(DIST)\lib\plc3.lib \
$(DIST)\lib\netlib.lib \
$(NULL)

2
parser/htmlparser/src/makefile.win
Просмотреть файл

@ -135,7 +135,7 @@ LCFLAGS = \
LLIBS= \
$(DIST)\lib\xpcom32.lib \
$(DIST)\lib\raptorbase.lib \
$(DIST)\lib\libplc21.lib \
$(DIST)\lib\plc3.lib \
$(DIST)\lib\expat.lib \
$(LIBNSPR)

2
rdf/build/makefile.win
Просмотреть файл

@ -43,7 +43,7 @@ LLIBS=\
$(DIST)\lib\raptorbase.lib \
$(DIST)\lib\raptorgfxwin.lib \
$(DIST)\lib\netlib.lib \
$(DIST)\lib\libplc21.lib \
$(DIST)\lib\plc3.lib \
$(DIST)\lib\raptorhtml.lib \
$(DIST)\lib\jsdom.lib \
$(DIST)\lib\js3250.lib \

2
rdf/tests/localfile/makefile.win
Просмотреть файл

@ -42,7 +42,7 @@ LLIBS= \
$(DIST)\lib\xpcom32.lib \
$(DIST)\lib\raptorbase.lib \
$(DIST)\lib\netlib.lib \
$(DIST)\lib\libplc21.lib \
$(DIST)\lib\plc3.lib \
$(LIBNSPR)
include <$(DEPTH)\config\rules.mak>

2
rdf/tests/rdfsink/makefile.win
Просмотреть файл

@ -42,7 +42,7 @@ LLIBS= \
$(DIST)\lib\xpcom32.lib \
$(DIST)\lib\raptorbase.lib \
$(DIST)\lib\netlib.lib \
$(DIST)\lib\libplc21.lib \
$(DIST)\lib\plc3.lib \
$(LIBNSPR)
include <$(DEPTH)\config\rules.mak>

2
silentdl/makefile.win
Просмотреть файл

@ -53,7 +53,7 @@ LLIBS = \
$(DIST)\lib\raptorbase.lib \
$(DIST)\lib\raptorgfxwin.lib \
$(LIBNSPR) \
$(DIST)\lib\libplc21.lib \
$(DIST)\lib\plc3.lib \
$(NULL)
OBJS = \

2
webshell/embed/ngprefs/win/makefile.win
Просмотреть файл

@ -31,7 +31,7 @@ LINCS = \
LLIBS = \
$(LIBNSPR) \
$(DIST)\lib\libplc21.lib \
$(DIST)\lib\plc3.lib \
$(DIST)\lib\xppref32.lib \
OLE32.lib \
UUID.lib \

2
webshell/src/makefile.win
Просмотреть файл

@ -74,7 +74,7 @@ LLIBS= \
$(DIST)\lib\raptorhtml.lib \
$(DIST)\lib\img32$(VERSION_NUMBER).lib \
$(DIST)\lib\util.lib \
$(DIST)\lib\libplc21.lib \
$(DIST)\lib\plc3.lib \
$(DIST)\lib\jsdom.lib \
$(DIST)\lib\netlib.lib \
$(LIBNSPR) \

2
webshell/tests/imgtest/makefile.win
Просмотреть файл

@ -35,7 +35,7 @@ LLIBS= \
$(DIST)\lib\raptorweb.lib \
$(DIST)\lib\xpcom32.lib \
$(LIBNSPR) \
$(DIST)\lib\libplc21.lib \
$(DIST)\lib\plc3.lib \
$(DIST)\lib\img32$(VERSION_NUMBER).lib \
$(DIST)\lib\util.lib \
comdlg32.lib

4
webshell/tests/viewer/makefile.win
Просмотреть файл

@ -32,7 +32,7 @@ MISCDEP= \
$(DIST)\lib\raptorweb.lib \
$(DIST)\lib\xpcom32.lib \
$(LIBNSPR) \
$(DIST)\lib\libplc21.lib
$(DIST)\lib\plc3.lib
OBJS = \
@ -91,7 +91,7 @@ MYLIBS= \
$(DIST)\lib\xpcom32.lib \
$(DIST)\lib\js32$(VERSION_NUMBER).lib \
$(LIBNSPR) \
$(DIST)\lib\libplc21.lib \
$(DIST)\lib\plc3.lib \
$(DIST)\lib\netlib.lib \
$(DIST)\lib\jsdom.lib \
comdlg32.lib \

2
xpcom/libxpt/xptinfo/src/makefile.win
Просмотреть файл

@ -37,7 +37,7 @@ LLIBS = \
$(DIST)\lib\libxpt$(MOZ_BITS).lib \
$(DIST)\lib\xpcom$(MOZ_BITS).lib \
$(LIBNSPR) \
$(DIST)\lib\libplc21.lib \
$(DIST)\lib\plc3.lib \
$(NULL)
CSRCS = \

2
xpcom/reflect/xptinfo/src/makefile.win
Просмотреть файл

@ -37,7 +37,7 @@ LLIBS = \
$(DIST)\lib\libxpt$(MOZ_BITS).lib \
$(DIST)\lib\xpcom$(MOZ_BITS).lib \
$(LIBNSPR) \
$(DIST)\lib\libplc21.lib \
$(DIST)\lib\plc3.lib \
$(NULL)
CSRCS = \

2
xpcom/src/makefile.win
Просмотреть файл

@ -28,7 +28,7 @@ LINCS = \
LLIBS = \
$(LIBNSPR) \
$(DIST)\lib\libplc21.lib \
$(DIST)\lib\plc3.lib \
$(DIST)\lib\libreg32.lib \
!if "$(MOZ_BITS)"=="32" && defined(MOZ_DEBUG) && defined(GLOWCODE)
$(GLOWDIR)\glowcode.lib \

9
xpcom/src/nsEventQueueService.cpp
Просмотреть файл

@ -79,14 +79,7 @@ EventQueueEntry::EventQueueEntry()
{
NS_INIT_REFCNT();
#ifdef XP_PC
// XXX: For now only use the main eventQ... When the event queue is
// created via PL_CreateNativeEventQueue(...) this can go away...
PL_InitializeEventsLib("");
mEventQueue = PL_GetMainEventQueue();
#else
mEventQueue = PL_CreateEventQueue("Thread event queue...", PR_GetCurrentThread());
#endif
mEventQueue = PL_CreateNativeEventQueue("Thread event queue...", PR_GetCurrentThread());
}
EventQueueEntry::~EventQueueEntry()

2
xpcom/tests/dynamic/makefile.win
Просмотреть файл

@ -28,7 +28,7 @@ LINCS = -I.. -I../../public
LLIBS= \
$(DIST)\lib\xpcom32.lib \
$(LIBNSPR) \
$(DIST)\lib\libplc21.lib
$(DIST)\lib\plc3.lib
!if "$(MOZ_BITS)"=="32" && defined(MOZ_DEBUG) && defined(GLOWCODE)
LLIBS=$(LLIBS) $(GLOWDIR)\glowcode.lib
!endif

2
xpcom/tests/makefile.win
Просмотреть файл

@ -38,7 +38,7 @@ LINCS=-I..\public -Iservices
LLIBS= \
$(DIST)\lib\xpcom32.lib \
$(LIBNSPR) \
$(DIST)\lib\libplc21.lib
$(DIST)\lib\plc3.lib
!if "$(MOZ_BITS)"=="32" && defined(MOZ_DEBUG) && defined(GLOWCODE)
LLIBS=$(LLIBS) $(GLOWDIR)\glowcode.lib
!endif

2
xpcom/tests/services/makefile.win
Просмотреть файл

@ -28,7 +28,7 @@ LINCS = -I.. -I../../public
LLIBS= \
$(DIST)\lib\xpcom32.lib \
$(LIBNSPR) \
$(DIST)\lib\libplc21.lib
$(DIST)\lib\plc3.lib
!if "$(MOZ_BITS)"=="32" && defined(MOZ_DEBUG) && defined(GLOWCODE)
LLIBS=$(LLIBS) $(GLOWDIR)\glowcode.lib
!endif

2
xpcom/tests/windows/makefile.win
Просмотреть файл

@ -30,7 +30,7 @@ LLIBS= \
uuid.lib \
$(DIST)\lib\xpcom32.lib \
$(LIBNSPR) \
$(DIST)\lib\libplc21.lib
$(DIST)\lib\plc3.lib
!if "$(MOZ_BITS)"=="32" && defined(MOZ_DEBUG) && defined(GLOWCODE)
LLIBS=$(LLIBS) $(GLOWDIR)\glowcode.lib
!endif

9
xpcom/threads/nsEventQueueService.cpp
Просмотреть файл

@ -79,14 +79,7 @@ EventQueueEntry::EventQueueEntry()
{
NS_INIT_REFCNT();
#ifdef XP_PC
// XXX: For now only use the main eventQ... When the event queue is
// created via PL_CreateNativeEventQueue(...) this can go away...
PL_InitializeEventsLib("");
mEventQueue = PL_GetMainEventQueue();
#else
mEventQueue = PL_CreateEventQueue("Thread event queue...", PR_GetCurrentThread());
#endif
mEventQueue = PL_CreateNativeEventQueue("Thread event queue...", PR_GetCurrentThread());
}
EventQueueEntry::~EventQueueEntry()

2
xpcom/tools/registry/makefile.win
Просмотреть файл

@ -30,7 +30,7 @@ PROGRAMS = $(PROG1)
LLIBS = \
$(LIBNSPR) \
$(DIST)\lib\libplc21.lib \
$(DIST)\lib\plc3.lib \
$(DIST)\lib\xpcom$(MOZ_BITS).lib \
!if "$(MOZ_BITS)"=="32" && defined(MOZ_DEBUG) && defined(GLOWCODE)
$(GLOWDIR)\glowcode.lib \

2
xpfe/AppCores/src/makefile.win
Просмотреть файл

@ -57,7 +57,7 @@ LLIBS = \
$(DIST)\lib\raptorbase.lib \
$(DIST)\lib\raptorgfxwin.lib \
$(LIBNSPR) \
$(DIST)\lib\libplc21.lib \
$(DIST)\lib\plc3.lib \
$(NULL)
OBJS = \

2
xpfe/apprunner/src/makefile.win
Просмотреть файл

@ -46,7 +46,7 @@ LCFLAGS = \
LLIBS= \
$(DIST)\lib\xpcom32.lib \
$(DIST)\lib\libplc21.lib \
$(DIST)\lib\plc3.lib \
$(LIBNSPR) \
$(NULL)

2
xpfe/appshell/src/makefile.win
Просмотреть файл

@ -62,7 +62,7 @@ LLIBS= \
$(DIST)\lib\xpcom32.lib \
$(DIST)\lib\raptorbase.lib \
$(DIST)\lib\raptorgfxwin.lib \
$(DIST)\lib\libplc21.lib \
$(DIST)\lib\plc3.lib \
$(DIST)\lib\netlib.lib \
$(LIBNSPR) \
$(NULL)

2
xpfe/bootstrap/makefile.win
Просмотреть файл

@ -68,7 +68,7 @@ LLIBS= \
$(DIST)\lib\xpcom32.lib \
$(DIST)\lib\raptorgfxwin.lib \
$(DIST)\lib\raptorbase.lib \
$(DIST)\lib\libplc21.lib \
$(DIST)\lib\plc3.lib \
$(DIST)\lib\netlib.lib \
$(LIBNSPR) \
$(NULL)

2
xpfe/browser/src/makefile.win
Просмотреть файл

@ -54,7 +54,7 @@ LLIBS= \
$(DIST)\lib\xpcom32.lib \
$(DIST)\lib\raptorbase.lib \
$(DIST)\lib\raptorgfxwin.lib \
$(DIST)\lib\libplc21.lib \
$(DIST)\lib\plc3.lib \
$(DIST)\lib\netlib.lib \
$(LIBNSPR) \
$(NULL)

2
xpfe/main/makefile.win
Просмотреть файл

@ -44,7 +44,7 @@ LCFLAGS = \
LLIBS= \
$(DIST)\lib\xpcom32.lib \
$(DIST)\lib\libplc21.lib \
$(DIST)\lib\plc3.lib \
$(LIBNSPR) \
$(NULL)

2
xpfe/tools/makefile.win
Просмотреть файл

@ -45,7 +45,7 @@ LCFLAGS = \
# These are the libraries we need to link with to create the exe
LLIBS= \
$(DIST)\lib\xpcom32.lib \
$(DIST)\lib\libplc21.lib \
$(DIST)\lib\plc3.lib \
$(LIBNSPR) \
$(NULL)

228
xpfe/xpviewer/src/makefile.win
Просмотреть файл

@ -1,228 +0,0 @@
#!nmake
#
# The contents of this file are subject to the Netscape Public License
# Version 1.0 (the "NPL"); you may not use this file except in
# compliance with the NPL. You may obtain a copy of the NPL at
# http://www.mozilla.org/NPL/
#
# Software distributed under the NPL is distributed on an "AS IS" basis,
# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
# for the specific language governing rights and limitations under the
# NPL.
#
# The Initial Developer of this code under the NPL is Netscape
# Communications Corporation. Portions created by Netscape are
# Copyright (C) 1998 Netscape Communications Corporation. All Rights
# Reserved.
DEPTH=..\..\..
IGNORE_MANIFEST=1
MAKE_OBJ_TYPE = EXE
PROGRAM = .\$(OBJDIR)\xpviewer.exe
RESFILE = xpviewer.res
MISCDEP= \
$(DIST)\lib\raptorweb.lib \
$(DIST)\lib\xpcom32.lib \
$(LIBNSPR) \
$(DIST)\lib\libplc21.lib
OBJS = \
.\$(OBJDIR)\nsFindDialog.obj \
.\$(OBJDIR)\nsXPBaseWindow.obj \
.\$(OBJDIR)\nsBrowserWindow.obj \
.\$(OBJDIR)\nsSetupRegistry.obj \
.\$(OBJDIR)\nsViewerApp.obj \
.\$(OBJDIR)\nsBrowserMain.obj \
.\$(OBJDIR)\JSConsole.obj \
$(NULL)
LINCS= \
-I$(PUBLIC)\raptor \
-I$(PUBLIC)\xpcom \
-I$(PUBLIC)\dom \
-I$(PUBLIC)\js \
-I$(PUBLIC)\netlib \
-I$(PUBLIC)\java \
-I$(PUBLIC)\plugin \
-I$(PUBLIC)\editor \
-I$(PUBLIC)\pref \
!ifdef MOZ_FULLCIRCLE
-I$(PUBLIC)\fullsoft \
!endif
$(NULL)
MYLIBS= \
$(DIST)\lib\raptorbase.lib \
$(DIST)\lib\raptorgfxwin.lib \
$(DIST)\lib\raptorhtml.lib \
$(DIST)\lib\raptorweb.lib \
$(DIST)\lib\raptorwidget.lib \
$(DIST)\lib\raptorhtmlpars.lib \
$(DIST)\lib\xpcom32.lib \
$(DIST)\lib\js32$(VERSION_NUMBER).lib \
$(LIBNSPR) \
$(DIST)\lib\libplc21.lib \
$(DIST)\lib\netlib.lib \
$(DIST)\lib\jsdom.lib \
comdlg32.lib \
!ifdef MOZ_FULLCIRCLE
$(DIST)\lib\fulls32.lib \
!endif
$(NULL)
LLIBS= $(MYLIBS) \
shell32.lib \
-SUBSYSTEM:CONSOLE
include <$(DEPTH)\config\rules.mak>
!ifdef MOZ_NO_DEBUG_RTL
OS_CFLAGS = $(OS_CFLAGS) -DMOZ_NO_DEBUG_RTL
!endif
install:: $(PROGRAM)
$(MAKE_INSTALL) $(PROGRAM) $(DIST)\bin
$(MAKE_INSTALL) resources\chrome\find.html $(DIST)\bin\res\samples
$(MAKE_INSTALL) resources\throbber\LargeAnimation00.gif $(DIST)\bin\res\throbber
$(MAKE_INSTALL) resources\throbber\LargeAnimation01.gif $(DIST)\bin\res\throbber
$(MAKE_INSTALL) resources\throbber\LargeAnimation02.gif $(DIST)\bin\res\throbber
$(MAKE_INSTALL) resources\throbber\LargeAnimation03.gif $(DIST)\bin\res\throbber
$(MAKE_INSTALL) resources\throbber\LargeAnimation04.gif $(DIST)\bin\res\throbber
$(MAKE_INSTALL) resources\throbber\LargeAnimation05.gif $(DIST)\bin\res\throbber
$(MAKE_INSTALL) resources\throbber\LargeAnimation06.gif $(DIST)\bin\res\throbber
$(MAKE_INSTALL) resources\throbber\LargeAnimation07.gif $(DIST)\bin\res\throbber
$(MAKE_INSTALL) resources\throbber\LargeAnimation08.gif $(DIST)\bin\res\throbber
$(MAKE_INSTALL) resources\throbber\LargeAnimation09.gif $(DIST)\bin\res\throbber
$(MAKE_INSTALL) resources\throbber\LargeAnimation10.gif $(DIST)\bin\res\throbber
$(MAKE_INSTALL) resources\throbber\LargeAnimation11.gif $(DIST)\bin\res\throbber
$(MAKE_INSTALL) resources\throbber\LargeAnimation12.gif $(DIST)\bin\res\throbber
$(MAKE_INSTALL) resources\throbber\LargeAnimation13.gif $(DIST)\bin\res\throbber
$(MAKE_INSTALL) resources\throbber\LargeAnimation14.gif $(DIST)\bin\res\throbber
$(MAKE_INSTALL) resources\throbber\LargeAnimation15.gif $(DIST)\bin\res\throbber
$(MAKE_INSTALL) resources\throbber\LargeAnimation16.gif $(DIST)\bin\res\throbber
$(MAKE_INSTALL) resources\throbber\LargeAnimation17.gif $(DIST)\bin\res\throbber
$(MAKE_INSTALL) resources\throbber\LargeAnimation18.gif $(DIST)\bin\res\throbber
$(MAKE_INSTALL) resources\throbber\LargeAnimation19.gif $(DIST)\bin\res\throbber
$(MAKE_INSTALL) resources\throbber\LargeAnimation20.gif $(DIST)\bin\res\throbber
$(MAKE_INSTALL) resources\throbber\LargeAnimation21.gif $(DIST)\bin\res\throbber
$(MAKE_INSTALL) resources\throbber\LargeAnimation22.gif $(DIST)\bin\res\throbber
$(MAKE_INSTALL) resources\throbber\LargeAnimation23.gif $(DIST)\bin\res\throbber
$(MAKE_INSTALL) resources\throbber\LargeAnimation24.gif $(DIST)\bin\res\throbber
$(MAKE_INSTALL) resources\throbber\LargeAnimation25.gif $(DIST)\bin\res\throbber
$(MAKE_INSTALL) resources\throbber\LargeAnimation26.gif $(DIST)\bin\res\throbber
$(MAKE_INSTALL) resources\throbber\LargeAnimation27.gif $(DIST)\bin\res\throbber
$(MAKE_INSTALL) resources\throbber\LargeAnimation28.gif $(DIST)\bin\res\throbber
$(MAKE_INSTALL) resources\throbber\LargeAnimation29.gif $(DIST)\bin\res\throbber
$(MAKE_INSTALL) resources\throbber\LargeAnimation30.gif $(DIST)\bin\res\throbber
$(MAKE_INSTALL) resources\throbber\LargeAnimation31.gif $(DIST)\bin\res\throbber
$(MAKE_INSTALL) resources\throbber\LargeAnimation32.gif $(DIST)\bin\res\throbber
$(MAKE_INSTALL) resources\throbber\LargeAnimation33.gif $(DIST)\bin\res\throbber
$(MAKE_INSTALL) resources\throbber\LargeAnimation34.gif $(DIST)\bin\res\throbber
$(MAKE_INSTALL) resources\throbber\LargeAnimation35.gif $(DIST)\bin\res\throbber
$(MAKE_INSTALL) resources\throbber\LargeAnimation36.gif $(DIST)\bin\res\throbber
$(MAKE_INSTALL) resources\throbber\LargeAnimation37.gif $(DIST)\bin\res\throbber
$(MAKE_INSTALL) resources\throbber\LargeAnimation38.gif $(DIST)\bin\res\throbber
$(MAKE_INSTALL) resources\toolbar\DialogAddrIcon.gif $(DIST)\bin\res\toolbar
$(MAKE_INSTALL) resources\toolbar\DialogAddrIcon_mo.gif $(DIST)\bin\res\toolbar
$(MAKE_INSTALL) resources\toolbar\DialogCompIcon.gif $(DIST)\bin\res\toolbar
$(MAKE_INSTALL) resources\toolbar\DialogCompIcon_mo.gif $(DIST)\bin\res\toolbar
$(MAKE_INSTALL) resources\toolbar\DialogMailIcon.gif $(DIST)\bin\res\toolbar
$(MAKE_INSTALL) resources\toolbar\DialogMailIcon_mo.gif $(DIST)\bin\res\toolbar
$(MAKE_INSTALL) resources\toolbar\DialogNavIcon.gif $(DIST)\bin\res\toolbar
$(MAKE_INSTALL) resources\toolbar\DialogNavIcon_mo.gif $(DIST)\bin\res\toolbar
$(MAKE_INSTALL) resources\toolbar\TB_Back.gif $(DIST)\bin\res\toolbar
$(MAKE_INSTALL) resources\toolbar\TB_Back_dis.gif $(DIST)\bin\res\toolbar
$(MAKE_INSTALL) resources\toolbar\TB_Back_mo.gif $(DIST)\bin\res\toolbar
$(MAKE_INSTALL) resources\toolbar\TB_Bookmarks.gif $(DIST)\bin\res\toolbar
$(MAKE_INSTALL) resources\toolbar\TB_Bookmarks_mo.gif $(DIST)\bin\res\toolbar
$(MAKE_INSTALL) resources\toolbar\TB_Edit.gif $(DIST)\bin\res\toolbar
$(MAKE_INSTALL) resources\toolbar\TB_Forward.gif $(DIST)\bin\res\toolbar
$(MAKE_INSTALL) resources\toolbar\TB_Forward_dis.gif $(DIST)\bin\res\toolbar
$(MAKE_INSTALL) resources\toolbar\TB_Forward_mo.gif $(DIST)\bin\res\toolbar
$(MAKE_INSTALL) resources\toolbar\TB_Home.gif $(DIST)\bin\res\toolbar
$(MAKE_INSTALL) resources\toolbar\TB_Home_mo.gif $(DIST)\bin\res\toolbar
$(MAKE_INSTALL) resources\toolbar\TB_HTab.gif $(DIST)\bin\res\toolbar
$(MAKE_INSTALL) resources\toolbar\TB_HTab_mo.gif $(DIST)\bin\res\toolbar
$(MAKE_INSTALL) resources\toolbar\TB_LoadImages.gif $(DIST)\bin\res\toolbar
$(MAKE_INSTALL) resources\toolbar\TB_LoadImages.mo.gif $(DIST)\bin\res\toolbar
$(MAKE_INSTALL) resources\toolbar\TB_Location.gif $(DIST)\bin\res\toolbar
$(MAKE_INSTALL) resources\toolbar\TB_Location_mo.gif $(DIST)\bin\res\toolbar
$(MAKE_INSTALL) resources\toolbar\TB_MiniAddr.gif $(DIST)\bin\res\toolbar
$(MAKE_INSTALL) resources\toolbar\TB_MiniComp.gif $(DIST)\bin\res\toolbar
$(MAKE_INSTALL) resources\toolbar\TB_MiniMail.gif $(DIST)\bin\res\toolbar
$(MAKE_INSTALL) resources\toolbar\TB_MiniNav.gif $(DIST)\bin\res\toolbar
$(MAKE_INSTALL) resources\toolbar\TB_MiniTab.gif $(DIST)\bin\res\toolbar
$(MAKE_INSTALL) resources\toolbar\TB_MixSecurity.gif $(DIST)\bin\res\toolbar
$(MAKE_INSTALL) resources\toolbar\TB_MixSecurity.mo.gif $(DIST)\bin\res\toolbar
$(MAKE_INSTALL) resources\toolbar\TB_Netscape.gif $(DIST)\bin\res\toolbar
$(MAKE_INSTALL) resources\toolbar\TB_Netscape_mo.gif $(DIST)\bin\res\toolbar
$(MAKE_INSTALL) resources\toolbar\TB_PersonalIcon.gif $(DIST)\bin\res\toolbar
$(MAKE_INSTALL) resources\toolbar\TB_Places.gif $(DIST)\bin\res\toolbar
$(MAKE_INSTALL) resources\toolbar\TB_Places_mo.gif $(DIST)\bin\res\toolbar
$(MAKE_INSTALL) resources\toolbar\TB_Print.gif $(DIST)\bin\res\toolbar
$(MAKE_INSTALL) resources\toolbar\TB_Print_mo.gif $(DIST)\bin\res\toolbar
$(MAKE_INSTALL) resources\toolbar\TB_Reload.gif $(DIST)\bin\res\toolbar
$(MAKE_INSTALL) resources\toolbar\TB_Reload_mo.gif $(DIST)\bin\res\toolbar
$(MAKE_INSTALL) resources\toolbar\TB_Search.gif $(DIST)\bin\res\toolbar
$(MAKE_INSTALL) resources\toolbar\TB_Search_mo.gif $(DIST)\bin\res\toolbar
$(MAKE_INSTALL) resources\toolbar\TB_Secure.gif $(DIST)\bin\res\toolbar
$(MAKE_INSTALL) resources\toolbar\TB_Secure_mo.gif $(DIST)\bin\res\toolbar
$(MAKE_INSTALL) resources\toolbar\TB_Stop.gif $(DIST)\bin\res\toolbar
$(MAKE_INSTALL) resources\toolbar\TB_Stop.mo.gif $(DIST)\bin\res\toolbar
$(MAKE_INSTALL) resources\toolbar\TB_Stop_dis.gif $(DIST)\bin\res\toolbar
$(MAKE_INSTALL) resources\toolbar\TB_Stop_mo.gif $(DIST)\bin\res\toolbar
$(MAKE_INSTALL) resources\toolbar\TB_Tab.gif $(DIST)\bin\res\toolbar
$(MAKE_INSTALL) resources\toolbar\TB_TabSmall.gif $(DIST)\bin\res\toolbar
$(MAKE_INSTALL) resources\toolbar\TB_TabSmall_mo.gif $(DIST)\bin\res\toolbar
$(MAKE_INSTALL) resources\toolbar\TB_Tab_mo.gif $(DIST)\bin\res\toolbar
$(MAKE_INSTALL) resources\toolbar\TB_Unsecure.gif $(DIST)\bin\res\toolbar
$(MAKE_INSTALL) resources\toolbar\TB_Unsecure.mo.gif $(DIST)\bin\res\toolbar
$(MAKE_INSTALL) resources\toolbar\TB_WhatsRelated.gif $(DIST)\bin\res\toolbar
$(MAKE_INSTALL) resources\toolbar\TB_WhatsRelated_mo.gif $(DIST)\bin\res\toolbar
$(MAKE_INSTALL) resources\toolbar\StatusBar-insecure.gif $(DIST)\bin\res\toolbar
$(MAKE_INSTALL) resources\toolbar\StatusBar-secure.gif $(DIST)\bin\res\toolbar
clobber::
rm -f $(DIST)\bin\xpviewer.exe
rm -f $(DIST)\bin\res\samples\find.html
rm -f $(DIST)\bin\res\samples\test0.html
rm -f $(DIST)\bin\res\samples\test1.html
rm -f $(DIST)\bin\res\samples\test2.html
rm -f $(DIST)\bin\res\samples\test3.html
rm -f $(DIST)\bin\res\samples\test4.html
rm -f $(DIST)\bin\res\samples\test5.html
rm -f $(DIST)\bin\res\samples\test6.html
rm -f $(DIST)\bin\res\samples\test7.html
rm -f $(DIST)\bin\res\samples\test8.html
rm -f $(DIST)\bin\res\samples\test8siz.html
rm -f $(DIST)\bin\res\samples\test8sca.html
rm -f $(DIST)\bin\res\samples\test8tab.html
rm -f $(DIST)\bin\res\samples\test_ed.html
rm -f $(DIST)\bin\res\samples\test9.html
rm -f $(DIST)\bin\res\samples\test9a.html
rm -f $(DIST)\bin\res\samples\test9b.html
rm -f $(DIST)\bin\res\samples\raptor.jpg
rm -f $(DIST)\bin\res\samples\Anieyes.gif
rm -f $(DIST)\bin\res\samples\gear1.gif
rm -f $(DIST)\bin\res\samples\rock_gra.gif
rm -f $(DIST)\bin\res\samples\bg.jpg
rm -f $(DIST)\bin\res\throbber\anims00.gif
rm -f $(DIST)\bin\res\throbber\anims01.gif
rm -f $(DIST)\bin\res\throbber\anims02.gif
rm -f $(DIST)\bin\res\throbber\anims03.gif
rm -f $(DIST)\bin\res\throbber\anims04.gif
rm -f $(DIST)\bin\res\throbber\anims05.gif
rm -f $(DIST)\bin\res\throbber\anims06.gif
rm -f $(DIST)\bin\res\throbber\anims07.gif
rm -f $(DIST)\bin\res\throbber\anims08.gif
rm -f $(DIST)\bin\res\throbber\anims09.gif
rm -f $(DIST)\bin\res\throbber\anims10.gif
rm -f $(DIST)\bin\res\throbber\anims11.gif
rm -f $(DIST)\bin\res\throbber\anims12.gif
rm -f $(DIST)\bin\res\throbber\anims13.gif