#100000#

3 files changed, 47 insertions, 12 deletions

diff --git a/goodies/source/inv/invader.cxx b/goodies/source/inv/invader.cxx
index 0e4e111f51bb..853872d89749 100644
--- a/goodies/source/inv/invader.cxx
+++ b/goodies/source/inv/invader.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: invader.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: pb $ $Date: 2000-11-03 14:52:34 $
+ *  last change: $Author: vg $ $Date: 2002-09-05 12:51:10 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -65,6 +65,9 @@
 #include "invader.hrc"
 #include "strings.hrc"
 #include "score.hxx"
+#include <svtools/solar.hrc>
+#include <cppuhelper/servicefactory.hxx>
+#include <comphelper/processfactory.hxx>
 
 #ifndef _SV_MSGBOX_HXX //autogen
 #include <vcl/msgbox.hxx>
@@ -614,11 +617,23 @@ void MyWindow::PlaceDialog(MessBox* pBox)
 }
 
 #ifdef TEST
-void MyApp::Main(int,char*[])
+void MyApp::Main()
 {
-    MyWindow aWindow( NULL, (ResMgr*)NULL);
+    ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >
+         xMSF = cppu::createRegistryServiceFactory(
+             rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "applicat.rdb" ) ), sal_True );
+
+    ::comphelper::setProcessServiceFactory( xMSF );
+
+    ByteString aRes = "tfu";
+    aRes += ByteString::CreateFromInt32(SOLARUPD);
+    ResMgr *pMyResMgr = ResMgr::CreateResMgr(aRes.GetBuffer());
+
+    MyWindow aWindow( NULL, pMyResMgr);
 
     Execute();
+
+    delete pMyResMgr;
 }
 
 MyApp aMyApp;
diff --git a/goodies/source/inv/invader.hxx b/goodies/source/inv/invader.hxx
index 8cac0f306d6e..494040579b1e 100644
--- a/goodies/source/inv/invader.hxx
+++ b/goodies/source/inv/invader.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: invader.hxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 16:30:09 $
+ *  last change: $Author: vg $ $Date: 2002-09-05 12:51:10 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -99,7 +99,7 @@ class MessBox;
 class MyApp : public Application
 {
     public:
-        virtual void        Main(int,char*[]);
+        virtual void        Main();
 };
 
 class MyWindow : public FloatingWindow
diff --git a/goodies/source/inv/makefile.mk b/goodies/source/inv/makefile.mk
index 3b2880d39603..c0661e2d9374 100644
--- a/goodies/source/inv/makefile.mk
+++ b/goodies/source/inv/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.2 $
+#   $Revision: 1.3 $
 #
-#   last change: $Author: pb $ $Date: 2000-11-03 14:52:34 $
+#   last change: $Author: vg $ $Date: 2002-09-05 12:51:56 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -64,6 +64,7 @@ PRJ=..$/..
 
 PRJNAME=goodies
 TARGET=invader
+TARGETTYPE=GUI
 
 AUTOSEG=true
 
@@ -103,8 +104,16 @@ RESLIB1SRSFILES=$(SRS)$/invader.srs
 .IF "$(TEST)"!=""
 APP1TARGET= $(TARGET)
 APP1OBJS= $(OBJ)$/invader.obj
-APP1STDLIBS= $(TOOLSLIB) $(SVLIB)
-APP1LIBS=$(LIBPRE) invader.lib
+APP1STDLIBS=	$(CPPULIB)			\
+                $(CPPUHELPERLIB)	\
+                $(COMPHELPERLIB)	\
+                $(VCLLIB)			\
+                $(TOOLSLIB) 		\
+                $(SALLIB)			\
+                $(VOSLIB)			\
+                $(SOTLIB)			\
+                $(SVLIB)
+APP1LIBS=$(LIBPRE) $(LB)$/invader.lib
 APP1STACK= 64000
 APP1DEPN= $(LB)$/invader.lib
 
@@ -138,7 +147,18 @@ SHL1DEF=$(MISC)$/$(SHL1TARGET).def
 # --- Targets -------------------------------------------------------
 
 
-.INCLUDE :  target.mk
+.INCLUDE :	target.mk
+
+ALLTAR: \
+    $(BIN)$/applicat.rdb
+
+$(BIN)$/applicat.rdb : makefile.mk $(SOLARBINDIR)$/applicat.rdb
+    rm -f $@
+    $(GNUCOPY) $(SOLARBINDIR)$/applicat.rdb $@
+     +cd $(BIN) && \
+         regcomp -register -r applicat.rdb \
+             -c $(DLLPRE)i18n$(UPD)$(DLLPOSTFIX)$(DLLPOST) \
+             -c $(DLLPRE)i18npool$(UPD)$(DLLPOSTFIX)$(DLLPOST)
 
 .IF "$(GUI)"=="WIN"