Unix support

This commit is contained in:
spider 1998-06-02 01:22:56 +00:00
parent ec433abac7
commit 535c918064
5 changed files with 16 additions and 14 deletions

View File

@ -52,6 +52,7 @@ public:
NS_IMETHOD ShowApplicationWindow(PRBool show) = 0 ;
NS_IMETHOD_(void *) GetApplicationWindowNativeInstance() = 0;
NS_IMETHOD_(nsIWidget *) GetApplicationWidget() = 0;
NS_IMETHOD ExitApplication() = 0 ;

View File

@ -26,14 +26,8 @@ LIBRARY_NAME = shell
DEFINES = -D_IMPL_NS_SHELL
EXTRA_DSO_LDOPTS+= -L$(DIST)/lib \
$(DIST)/lib/libxpcom.a \
$(DIST)/lib/libraptorbase.a \
$(DIST)/lib/libraptorgfx.a \
$(DIST)/lib/libnspr21.a \
$(DIST)/lib/libplds21.a \
$(DIST)/lib/libplc21.a \
$(DIST)/lib/libmsgc21.a \
$(DIST)/lib/libreg.a
$(DIST)/bin/libxpcom.so \
$(DIST)/bin/libreg.so -lXm -lXt -lX11 $(LIBNSPR)
ifeq ($(OS_ARCH),linux)
EXTRA_DSO_LDOPTS+= /usr/lib/libc.a /usr/lib/libstdc++.a

View File

@ -84,6 +84,7 @@ nsresult nsShellInstance::Run()
extern XtAppContext app_context ;
XtAppMainLoop(app_context) ;
return NS_OK;
#else
return NS_OK;
#endif
@ -224,6 +225,11 @@ void * nsShellInstance::GetApplicationWindowNativeInstance()
return (mApplicationWindow->GetNativeData(NS_NATIVE_WINDOW));
}
nsIWidget * nsShellInstance::GetApplicationWidget()
{
return (mApplicationWindow);
}
nsShellInstanceFactory::nsShellInstanceFactory()
{
}

View File

@ -57,6 +57,7 @@ public:
NS_IMETHOD ShowApplicationWindow(PRBool show) ;
NS_IMETHOD_(void *) GetApplicationWindowNativeInstance() ;
NS_IMETHOD_(nsIWidget *) GetApplicationWidget() ;
NS_IMETHOD ExitApplication() ;

View File

@ -30,14 +30,14 @@ DIRS =
OBJS = $(CPPSRCS:.cpp=.o)
EX_LIBS = $(DIST)/lib/libshell_s.a \
$(DIST)/lib/libxpcom.a \
$(DIST)/lib/libreg.a \
$(DIST)/lib/libraptorbase.a \
$(DIST)/lib/libraptorgfx.a \
$(DIST)/bin/libxpcom.so \
$(DIST)/bin/libreg.so \
$(DIST)/bin/libraptorbase.so \
$(DIST)/bin/libraptorgfx.so \
$(DIST)/lib/libplc21.a \
$(DIST)/lib/libplds21.a \
$(DIST)/lib/libnspr21.a \
$(DIST)/lib/libshell.a \
$(DIST)/bin/libshell.so \
$(NULL)
PROGS = $(addprefix $(OBJDIR)/, $(CPPSRCS:.cpp=))
@ -55,7 +55,7 @@ $(PROGS):$(OBJDIR)/%: $(OBJDIR)/%.o $(EX_LIBS)
ifeq ($(OS_ARCH),linux)
$(CCC) -rdynamic -o $@ $@.o $(LDFLAGS) $(EX_LIBS) $(OS_LIBS) -lXm -lXt -lX11 -lXp -lXext
else
$(CCC) -o $@ $@.o $(LDFLAGS) $(EX_LIBS) $(OS_LIBS) -lXt -lX11
$(CCC) -o $@ $@.o $(LDFLAGS) $(EX_LIBS) $(OS_LIBS) -lXm -lXt -lX11
endif
export::