[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdelibs/dcop
From:       Christian Ehrlicher <Ch.Ehrlicher () gmx ! de>
Date:       2006-02-03 16:38:12
Message-ID: 1138984692.609098.19521.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 505322 by chehrlic:

fix compile & link on windows

 M  +2 -11     SConscript  
 M  +2 -4      client/SConscript  
 M  +2 -2      dcopserver.cpp  


--- trunk/KDE/kdelibs/dcop/SConscript #505321:505322
@@ -45,8 +45,6 @@
 obj.ccflags += ice_ccflags
 if env['WINDOWS']:
 	obj.ccflags  += ' -DKICE_EXPORT=DCOP_EXPORT -DKDECORE_EXPORT= '
-	obj.libpaths += ' ../win/'
-	obj.libs     += ' kdewin32 ws2_32'
 obj.execute()
 
 # dcopserver program
@@ -57,12 +55,8 @@
 obj.libpaths = '.'
 obj.libs     = 'DCOP'
 
-if env['WINDOWS']: 
-	if env['CC'] != 'cl':
-		obj.ccflags  += ' -Dkdemain=main'
-
-	obj.libpaths += ' ../win/'
-	obj.libs     += ' kdewin32 ws2_32'
+if env['WINDOWS']:
+	obj.ccflags  += ' -Dkdemain=main'
  		
 obj.execute()
 
@@ -82,9 +76,6 @@
 obj.target='dcopserver_shutdown'
 obj.source='dcopserver_shutdown.c'
 obj.instdir  = env['KDEBIN']
-if env['WINDOWS']:
-	obj.libpaths = '../win/'
-	obj.libs     = 'kdewin32 ws2_32'
 
 obj.execute()
 
--- trunk/KDE/kdelibs/dcop/client/SConscript #505321:505322
@@ -10,10 +10,8 @@
 	obj.libpaths  = '.. '
 	obj.libs      = 'DCOP '
 	if env['WINDOWS']:
-		obj.libpaths += ' ../../win '
-		obj.libs     += ' kdewin32 ws2_32 '
-		if env['CC'] == 'gcc':
-			obj.ccflags  += '-Dkdemain=main'
+		obj.libs     += ' ws2_32 '
+		obj.ccflags  += '-Dkdemain=main'
 		
 
 	obj.uselib    = 'QT QTCORE QT3SUPPORT KDE4'
--- trunk/KDE/kdelibs/dcop/dcopserver.cpp #505321:505322
@@ -1324,8 +1324,8 @@
 #ifndef NDEBUG
     fprintf( stderr, "DCOPServer : slotShutdown() -> waiting for clients to disconnect.\n" );
 #endif
+#ifndef Q_OS_WIN
     char c;
-#ifndef Q_OS_WIN
     read(pipeOfDeath[0], &c, 1);
 #endif
     if (!shutdown)
@@ -1718,7 +1718,7 @@
 #endif 
 
 
-extern "C" DCOP_EXPORT int kdemain( int argc, char* argv[] )
+extern "C" KDE_EXPORT int kdemain( int argc, char* argv[] )
 {
 #ifdef Q_OS_WIN
     qInstallMsgHandler(myMessageOutput);
[prev in list] [next in list] [prev in thread] [next in thread]