summaryrefslogtreecommitdiff
path: root/rsc/source/prj
diff options
context:
space:
mode:
authorTor Lillqvist <tlillqvist@novell.com>2011-05-21 17:00:45 +0300
committerTor Lillqvist <tlillqvist@novell.com>2011-05-21 17:00:45 +0300
commit27266b10b8aaa9e2f559de7e6c36249c329105f4 (patch)
tree81419fa86b4fbfbdb77d24a6d883816c1a37d12e /rsc/source/prj
parent680ba815b8f0874f89c6948217c2a48d74fcc766 (diff)
Drop OS2
Diffstat (limited to 'rsc/source/prj')
-rw-r--r--rsc/source/prj/makefile.mk4
-rw-r--r--rsc/source/prj/start.cxx25
2 files changed, 2 insertions, 27 deletions
diff --git a/rsc/source/prj/makefile.mk b/rsc/source/prj/makefile.mk
index b8e0224a5cd0..ebd1740aa1b3 100644
--- a/rsc/source/prj/makefile.mk
+++ b/rsc/source/prj/makefile.mk
@@ -45,9 +45,7 @@ APP1TARGET= rsc
APP1STDLIBS=$(TOOLSLIB) $(I18NISOLANGLIB) $(SALLIB) # $(RTLLIB)
APP1LIBS= $(LB)$/rsctoo.lib
APP1OBJS= $(OBJ)$/start.obj
-.IF "$(GUI)" != "OS2"
APP1STACK=64000
-.ENDIF
APP1RPATH=NONE
APP2TARGET= rsc2
@@ -58,9 +56,7 @@ APP2LIBS= $(LB)$/rsctoo.lib \
$(LB)$/rscrsc.lib \
$(LB)$/rscmis.lib
APP2OBJS= $(OBJ)$/gui.obj
-.IF "$(GUI)" != "OS2"
APP2STACK=64000
-.ENDIF
APP2RPATH=NONE
# --- Targets ------------------------------------------------------------
diff --git a/rsc/source/prj/start.cxx b/rsc/source/prj/start.cxx
index 532851ffbdea..8a949546ce3a 100644
--- a/rsc/source/prj/start.cxx
+++ b/rsc/source/prj/start.cxx
@@ -41,12 +41,7 @@
#include <io.h>
#include <process.h>
-#if defined ( OS2 ) && !defined ( GCC )
-#include <direct.h>
-#endif
-#if !defined ( OS2 )
#include <dos.h>
-#endif
#endif // UNX
#include <rsctools.hxx>
@@ -151,11 +146,7 @@ static sal_Bool CallPrePro( const ByteString& rPrePro,
pCmdL = &aRespCmdL;
for( i = 0; i < (int)(aNewCmdL.GetCount() -1); i++ )
{
-#ifdef OS2
- fprintf( fRspFile, "%s\n", (const char *)aNewCmdL.GetEntry( i ) );
-#else
fprintf( fRspFile, "%s ", (const char *)aNewCmdL.GetEntry( i ) );
-#endif
}
fclose( fRspFile );
@@ -171,7 +162,7 @@ static sal_Bool CallPrePro( const ByteString& rPrePro,
}
}
-#if defined UNX || defined OS2
+#if defined UNX
nExit = spawnvp( P_WAIT, rPrePro.GetBuffer(), (char* const*)pCmdL->GetBlock() );
#else
nExit = spawnvp( P_WAIT, (char*)rPrePro.GetBuffer(), (const char**)pCmdL->GetBlock() );
@@ -238,28 +229,16 @@ static sal_Bool CallRsc2( ByteString aRsc2Name,
{
}
else
-#ifdef OS2
- fprintf( fRspFile, "%s\n",
-#else
fprintf( fRspFile, "%s ",
-#endif
(const char *)pCmdLine->GetEntry( i ) );
};
-#ifdef OS2
- fprintf( fRspFile, "%s\n", aSrsName.GetBuffer() );
-#else
fprintf( fRspFile, "%s", aSrsName.GetBuffer() );
-#endif
for ( size_t i = 0, n = pInputList->size(); i < n; ++i )
{
pString = (*pInputList)[ i ];
-#ifdef OS2
- fprintf( fRspFile, "%s\n", pString->GetBuffer() );
-#else
fprintf( fRspFile, " %s", pString->GetBuffer() );
-#endif
};
fclose( fRspFile );
@@ -281,7 +260,7 @@ static sal_Bool CallRsc2( ByteString aRsc2Name,
printf( "\n" );
}
-#if defined UNX || defined OS2
+#if defined UNX
nExit = spawnvp( P_WAIT, aRsc2Name.GetBuffer(), (char* const*)aNewCmdL.GetBlock() );
#else
nExit = spawnvp( P_WAIT, (char*)aRsc2Name.GetBuffer(), (const char**)aNewCmdL.GetBlock() );