You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by yd...@apache.org on 2013/05/20 10:24:42 UTC
svn commit: r1484394 - in /openoffice/trunk/main:
scp2/source/ooo/file_library_ooo.scp sdext/prj/d.lst
sdext/source/minimizer/makefile.mk sdext/source/presenter/makefile.mk
Author: ydario
Date: Mon May 20 08:24:41 2013
New Revision: 1484394
URL: http://svn.apache.org/r1484394
Log:
i118923 - OS/2 port: use short names for dynamic libraries.
Modified:
openoffice/trunk/main/scp2/source/ooo/file_library_ooo.scp
openoffice/trunk/main/sdext/prj/d.lst
openoffice/trunk/main/sdext/source/minimizer/makefile.mk
openoffice/trunk/main/sdext/source/presenter/makefile.mk
Modified: openoffice/trunk/main/scp2/source/ooo/file_library_ooo.scp
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/scp2/source/ooo/file_library_ooo.scp?rev=1484394&r1=1484393&r2=1484394&view=diff
==============================================================================
--- openoffice/trunk/main/scp2/source/ooo/file_library_ooo.scp (original)
+++ openoffice/trunk/main/scp2/source/ooo/file_library_ooo.scp Mon May 20 08:24:41 2013
@@ -1356,7 +1356,7 @@ File gid_File_Lib_PresentationMinimizer
#ifdef UNX
Name = STRING(CONCAT2(PresentationMinimizer.uno,UNXSUFFIX));
#elif defined OS2
- Name = "PresentationMinimizer.dll";
+ Name = "PreMin.dll";
#else
Name = "PresentationMinimizer.uno.dll";
#endif
@@ -1369,7 +1369,7 @@ File gid_File_Lib_PresenterScreen
#ifdef UNX
Name = STRING(CONCAT2(PresenterScreen.uno,UNXSUFFIX));
#elif defined OS2
- Name = "PresenterScreen.dll";
+ Name = "PreScr.dll";
#else
Name = "PresenterScreen.uno.dll";
#endif
Modified: openoffice/trunk/main/sdext/prj/d.lst
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sdext/prj/d.lst?rev=1484394&r1=1484393&r2=1484394&view=diff
==============================================================================
--- openoffice/trunk/main/sdext/prj/d.lst (original)
+++ openoffice/trunk/main/sdext/prj/d.lst Mon May 20 08:24:41 2013
@@ -25,7 +25,9 @@ mkdir: %_DEST%\xml%_EXT%
..\%__SRC%\misc\PresenterScreen.component %_DEST%\xml%_EXT%\PresenterScreen.component
..\%__SRC%\bin\PresentationMinimizer*.dll %_DEST%\bin%_EXT%\PresentationMinimizer*.dll
+..\%__SRC%\bin\PreMin*.dll %_DEST%\bin%_EXT%\PreMin*.dll
..\%__SRC%\lib\PresentationMinimizer*.so %_DEST%\lib%_EXT%
..\%__SRC%\bin\PresenterScreen*.dll %_DEST%\bin%_EXT%\PresenterScreen*.dll
+..\%__SRC%\bin\PreScr*.dll %_DEST%\bin%_EXT%\PreScr*.dll
..\%__SRC%\lib\PresenterScreen*.so %_DEST%\lib%_EXT%
..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib
Modified: openoffice/trunk/main/sdext/source/minimizer/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sdext/source/minimizer/makefile.mk?rev=1484394&r1=1484393&r2=1484394&view=diff
==============================================================================
--- openoffice/trunk/main/sdext/source/minimizer/makefile.mk (original)
+++ openoffice/trunk/main/sdext/source/minimizer/makefile.mk Mon May 20 08:24:41 2013
@@ -55,7 +55,11 @@ SLOFILES=\
# --- Library -----------------------------------
+.IF "$(GUI)"=="OS2"
+SHL1TARGET=PreMin
+.ELSE
SHL1TARGET= $(TARGET).uno
+.ENDIF
SHL1STDLIBS=\
$(CPPUHELPERLIB)\
Modified: openoffice/trunk/main/sdext/source/presenter/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sdext/source/presenter/makefile.mk?rev=1484394&r1=1484393&r2=1484394&view=diff
==============================================================================
--- openoffice/trunk/main/sdext/source/presenter/makefile.mk (original)
+++ openoffice/trunk/main/sdext/source/presenter/makefile.mk Mon May 20 08:24:41 2013
@@ -95,7 +95,11 @@ SLOFILES=\
# --- Library -----------------------------------
+.IF "$(GUI)"=="OS2"
+SHL1TARGET=PreScr
+.ELSE
SHL1TARGET=$(TARGET).uno
+.ENDIF
SHL1STDLIBS= \
$(CPPUHELPERLIB) \