summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOliver Bolte <obo@openoffice.org>2006-04-24 13:09:34 +0000
committerOliver Bolte <obo@openoffice.org>2006-04-24 13:09:34 +0000
commita87007680bab8e661ed41f8bd137c5be6b95dfbd (patch)
treeb3d2618396ec37c3b3c4d0eb8c939c54c86ac8bb
parente5723f9510c5c94d0b2f6d84390a323dcb97d8f0 (diff)
changes for linux
-rw-r--r--soldep/source/makefile.mk29
-rw-r--r--soldep/source/sdtresid.cxx7
2 files changed, 23 insertions, 13 deletions
diff --git a/soldep/source/makefile.mk b/soldep/source/makefile.mk
index c5685a330b97..3fb25ffd5a92 100644
--- a/soldep/source/makefile.mk
+++ b/soldep/source/makefile.mk
@@ -2,9 +2,9 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.6 $
+# $Revision: 1.7 $
#
-# last change: $Author: obo $ $Date: 2006-04-20 15:16:23 $
+# last change: $Author: obo $ $Date: 2006-04-24 14:09:34 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
@@ -68,6 +68,7 @@ TARGET=soldep
# --- Settings -----------------------------------------------------
+.INCLUDE : $(PRJ)$/util$/perl.mk
.INCLUDE : settings.mk
# --- Files --------------------------------------------------------
@@ -85,8 +86,8 @@ SLOFILES = \
$(SLO)$/objwin.obj
SHL1TARGET =$(TARGET)$(UPD)$(DLLPOSTFIX)
-SHL1IMPLIB =i$(TARGET)
-SHL1LIBS =$(SLB)$/$(TARGET).lib
+SHL1IMPLIB =$(TARGET)
+SHL1LIBS =$(SLB)$/bootstrpdt.lib
SHL1DEF =$(MISC)$/$(SHL1TARGET).def
SHL1DEPN =$(SHL1LIBS)
SHL1STDLIBS = $(SVTOOLLIB) \
@@ -101,7 +102,6 @@ SHL1STDLIBS = $(SVTOOLLIB) \
$(OSLLIB) \
$(SALLIB) \
$(CPPULIB) \
- $(LB)$/ibootstrpdt.lib \
$(PERL_LIB)
.IF "$(GUI)" == "UNX"
@@ -114,15 +114,18 @@ DEF1NAME =$(SHL1TARGET)
DEF1DEPN =$(MISC)$/$(SHL1TARGET).flt
DEFLIB1NAME =$(TARGET)
+SRC1FILES = \
+ soldlg.src
+RES1TARGET = dep
+SRS1NAME=$(TARGET)
+SRS1FILES = \
+ $(SRS)$/$(TARGET).srs
+
#------------- Application ---------------
APP1TARGET=soldepl
-APP1OBJS= \
- $(SLO)$/depapp.obj
-
-APP1LIBS= $(LB)$/ibootstrpdt.lib \
- $(LB)$/isoldep.lib
APP1ICON=soldep.ico
+
APP1STDLIBS= \
$(SVTOOLLIB) \
$(CPPUHELPERLIB) \
@@ -138,6 +141,12 @@ APP1STDLIBS= \
$(CPPULIB) \
$(PERL_LIB)
+APP1LIBS=\
+ $(SLB)$/bootstrpdt.lib \
+ $(SLB)$/soldep.lib
+
+APP1OBJS= \
+ $(SLO)$/depapp.obj
# --- Targets ------------------------------------------------------
diff --git a/soldep/source/sdtresid.cxx b/soldep/source/sdtresid.cxx
index 826f505681fa..e87a79a5cb48 100644
--- a/soldep/source/sdtresid.cxx
+++ b/soldep/source/sdtresid.cxx
@@ -4,9 +4,9 @@
*
* $RCSfile: sdtresid.cxx,v $
*
- * $Revision: 1.1 $
+ * $Revision: 1.2 $
*
- * last change: $Author: obo $ $Date: 2006-04-20 15:07:14 $
+ * last change: $Author: obo $ $Date: 2006-04-24 14:09:34 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -54,4 +54,5 @@ SolDevDll::~SolDevDll()
DtSodResId::DtSodResId( USHORT nId ) :
ResId(nId, (*(SolDevDll**)GetAppData( SHL_SCH ))->GetResMgr())
{
-} \ No newline at end of file
+}
+