Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-21 17:59:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

More OS/2 changes. Batches 19 & 20 of Bug #34106 r=pavlov

Browse Source
This commit is contained in:
cls%seawood.org 2000-05-21 13:32:11 +00:00
parent a63714b4e6
commit cb31f6e62d
7 changed files with 26 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dbm/tests/Makefile.in
View File

@ -33,7 +33,11 @@ CSRCS = lots.c
EXTRA_DSO_LIBS = mozdbm_s
LIBS = $(EXTRA_DSO_LIBS)
ifeq ($(MOZ_OS2_TOOLS),VACPP)
LIBS = $(DIST)/lib/libmozdbm_s.$(LIB_SUFFIX)
else
LIBS = $(EXTRA_DSO_LIBS)
endif
include $(topsrcdir)/config/rules.mk

4
editor/txmgr/tests/Makefile.in
View File

@ -26,11 +26,11 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
PROGRAM = TestTXMgr
PROGRAM = TestTXMgr$(BIN_SUFFIX)
CPPSRCS = TestTXMgr.cpp
LIBS = $(XPCOM_LIBS) $(NSPR_LIBS)
LIBS = $(MOZ_COMPONENT_LIBS)
include $(topsrcdir)/config/rules.mk

2
js/src/liveconnect/Makefile.in
View File

@ -85,6 +85,8 @@ CPPSRCS = \
LLIBS += $(DIST)/lib/xpcom32.lib
EXTRA_DSO_LDOPTS = $(MOZ_JS_LIBS) $(MOZ_COMPONENT_LIBS)
EXPORTS += \
$(srcdir)/nsILiveconnect.h \
$(srcdir)/nsISecureLiveconnect.h \

5
js/src/xpconnect/tests/Makefile.in
View File

@ -39,7 +39,7 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = TestXPC
SIMPLE_PROGRAMS = TestXPC
SIMPLE_PROGRAMS = TestXPC$(BIN_SUFFIX)
DIRS = idl components
@ -49,8 +49,7 @@ LIBS = \
-L$(DIST)/bin \
-L$(DIST)/lib \
$(MOZ_JS_LIBS) \
$(XPCOM_LIBS) \
$(NSPR_LIBS) \
$(MOZ_COMPONENT_LIBS) \
$(NULL)
include $(topsrcdir)/config/rules.mk

7
rdf/tests/domds/Makefile.in
View File

@ -45,12 +45,13 @@ XPIDLSRCS = \
nsIRDFDOMViewerObject.idl \
$(NULL)
EXTRA_DSO_LIBS = rdfutil_s
EXTRA_DSO_LDOPTS = \
-L$(DIST)/bin \
-L$(DIST)/lib \
$(XPCOM_LIBS) \
-lrdfutil_s \
$(NSPR_LIBS) \
$(EXTRA_DSO_LIBS) \
$(MOZ_COMPONENT_LIBS) \
$(NULL)
include $(topsrcdir)/config/rules.mk

16
widget/src/os2/res/Makefile.in
View File

@ -26,7 +26,7 @@ include $(DEPTH)/config/autoconf.mk
OS2_LIBRARYNAME = wdgtres
DLL = wdgtres.dll
RCOPTS = -n -x2 -i . -i $(RCDEFS)
RCOPTS = -n -x2 -i .
ifneq ($(MOZ_OS2_TOOLS),VACPP)
OMF_FLAG = -Zomf
@ -39,21 +39,25 @@ install: $(DLL)
# XXX Have to copy files because rc and link386 are too stupid for a mirror tree build
$(DLL): wdgtres.obj wdgtres.res
ifeq ($(MOZ_OS2_TOOLS),VACPP) # link386 dies on fatal error L1104: R:\IBMCXXO\LIB\cpprss36.lib : not valid library
ilink /nol wdgtres.obj /O:$@ wdgtres.def
else
link386 /nol wdgtres,$@,nul,,wdgtres.def
endif
rc $(RCOPTS) wdgtres.res $@
wdgtres.res: wdgtres.rc
cp $(topsrcdir)/widget/src/os2/resID.h ./resID.h
cp $(srcdir)/frame.ico ./frame.ico
cp $(srcdir)/folder.ico ./folder.ico
cp $(srcdir)/dragitem.ico ./dragitem.ico
cp $(srcdir)/select.ptr ./select.ptr
cp $(srcdir)/wdgtres.def ./wdgtres.def
link386 /nol wdgtres,$@,nul,,wdgtres.def
rc $(RCOPTS) wdgtres.res $@
wdgtres.res: wdgtres.rc
rc $(RCOPTS) -r $(srcdir)/wdgtres.rc $@
wdgtres.obj: wdgtres.C
$(CC) -o $@ -s -c $(CFLAGS) $(OMF_FLAG) $<
realclean clean:
rm -rf $(DLL) *.res *.obj
rm -rf $(DLL) *.res *.obj *.ico *.h *.def

2
widget/src/os2/tests/Makefile.in
View File

@ -29,7 +29,7 @@ SIMPLE_PROGRAMS = dirpicker$(BIN_SUFFIX)
CPPSRCS = dirpicker.cpp
LIBS = $(DIST)/lib/libraptorwidget_s.lib
LIBS = $(DIST)/lib/libwdgtos2.lib
include $(topsrcdir)/config/rules.mk