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

List:       kde-commits
Subject:    KDE/kdelibs/bksys
From:       Ralf Habacker <Ralf.Habacker () freenet ! de>
Date:       2006-02-08 20:11:43
Message-ID: 1139429503.574175.19319.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 507249 by habacker:

- mingw requires library path and library names as separate linker flags 
- setting CPPFLAGS seems to be wrong, should use CCFLAGS 
- setting CXXFLAGS is obsolated because CCFLAGS is already included 
-> mingw headers in win are now detected, hope this does not break msvc 



 M  +6 -10     libwinposix.py  


--- trunk/KDE/kdelibs/bksys/libwinposix.py #507248:507249
@@ -68,25 +68,21 @@
 
 		# add the lib & include path to the standard libs
 		if env['ARGS'].get('debug', None) != None:
-			winposixlib = 'kdewin32d.lib'
+			winposixlib = 'kdewin32d'
 		else:
-			winposixlib = 'kdewin32.lib'
+			winposixlib = 'kdewin32'
 
 		if env['CC'] == 'cl':
 			env['CCFLAGS_LIBWINPOSIX']   = [ '/I'+winposixdir+'\\include','/I'+winposixdir+'\\include\\msvc' ]
-			env['CXXFLAGS_LIBWINPOSIX']  = [ '/I'+winposixdir+'\\include','/I'+winposixdir+'\\include\\msvc' ]
-			env['LFLAGS_LIBWINPOSIX']    = [ '/LIBPATH:'+winposixdir+'\\lib',winposixlib ]
+			env['LFLAGS_LIBWINPOSIX']    = [ '/LIBPATH:'+winposixdir+'\\lib',winposixlib + '.lib' ]
 		elif env['CC'] == 'gcc':
 			env['CCFLAGS_LIBWINPOSIX']   = [ '-I'+winposixdir+'\\include','-I'+winposixdir+'\\include\\mingw' ]
-			env['CXXFLAGS_LIBWINPOSIX']  = [ '-I'+winposixdir+'\\include','-I'+winposixdir+'\\include\\mingw' ]
-			env['LFLAGS_LIBWINPOSIX']    = [ '-l'+winposixdir+'\\lib\\'+winposixlib ]
+			env['LFLAGS_LIBWINPOSIX']    = [ '-L'+winposixdir+'\\lib','-l'+winposixlib]
 
 		env['CACHED_LIBWINPOSIX'] = 1
 		opts.Save(optionFile, env)
 
 	if env.has_key('CCFLAGS_LIBWINPOSIX'):
-		env.AppendUnique( CPPFLAGS  = env['CCFLAGS_LIBWINPOSIX'] )
-	if env.has_key('CXXFLAGS_LIBWINPOSIX'):
-		env.AppendUnique( CCFLAGS   = env['CXXFLAGS_LIBWINPOSIX'] )
+		env.AppendUnique( CCFLAGS  = env['CCFLAGS_LIBWINPOSIX'] )
 	if env.has_key('LFLAGS_LIBWINPOSIX'):
-		env.AppendUnique( LINKFLAGS = env['LFLAGS_LIBWINPOSIX'] )
+		env.AppendUnique( LINKFLAGS = env['LFLAGS_LIBWINPOSIX'] )
\ No newline at end of file
[prev in list] [next in list] [prev in thread] [next in thread]