[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-09 12:00:13
Message-ID: 1139486413.105994.22143.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 507500 by habacker:

fixed mingw problems

 M  +22 -14    libwinposix.py  
 M  +0 -4      lowlevel.py  


--- trunk/KDE/kdelibs/bksys/libwinposix.py #507499:507500
@@ -7,8 +7,13 @@
 - call qmake to create correct Makefile
 - execute Makefile
 - add winposix-lib to the buildsystem
+
+Notes
+- could be used in uselib attribute 
+- include/library settings are added for the following configure process and the \
build process  """
 
+
 def exists(env):
 	return true
 
@@ -28,14 +33,14 @@
 	optionFile = env['CACHEDIR'] + 'libwinposix.cache.py'
 	opts = Options(optionFile)
 	opts.AddOptions(
-		('CACHED_LIBWINPOSIX', 'Whether libwinposix is available'),
-		('CCFLAGS_LIBWINPOSIX',''),
-		('CXXFLAGS_LIBWINPOSIX',''),
-		('LFLAGS_LIBWINPOSIX',''),
+		('CACHED_WINPOSIX', 'Whether libwinposix is available'),
+		('CPPPATH_WINPOSIX',''),
+		('LIBPATH_WINPOSIX',''),
+		('LIB_WINPOSIX',''),
 		)
 	opts.Update(env)
 
-	if not env['HELP'] and (env['_CONFIGURE_'] or not \
env.has_key('CACHED_LIBWINPOSIX')): +	if not env['HELP'] and (env['_CONFIGURE_'] or \
not env.has_key('CACHED_WINPOSIX')):  p=env.pprint
 		winposixdir = 'win'
 		winposixpro = 'win.pro'
@@ -73,16 +78,19 @@
 			winposixlib = 'kdewin32'
 
 		if env['CC'] == 'cl':
-			env['CCFLAGS_LIBWINPOSIX']   = [ \
                '/I'+winposixdir+'\\include','/I'+winposixdir+'\\include\\msvc' ]
-			env['LFLAGS_LIBWINPOSIX']    = [ '/LIBPATH:'+winposixdir+'\\lib',winposixlib + \
'.lib' ] +			env['CPPPATH_WINPOSIX']  = [ \
env.join(os.getcwd(),winposixdir,'include'),env.join(os.getcwd(),winposixdir,'include','msvc')]
 +			env['LIBPATH_WINPOSIX']   = [ env.join(os.getcwd(),winposixdir,'lib')]
+			env['LIB_WINPOSIX']       = [ winposixlib,'ws2_32' ]
 		elif env['CC'] == 'gcc':
-			env['CCFLAGS_LIBWINPOSIX']   = [ \
                '-I'+winposixdir+'\\include','-I'+winposixdir+'\\include\\mingw' ]
-			env['LFLAGS_LIBWINPOSIX']    = [ '-L'+winposixdir+'\\lib','-l'+winposixlib]
+			env['CPPPATH_WINPOSIX']  = [ \
env.join(os.getcwd(),winposixdir,'include'),env.join(os.getcwd(),winposixdir,'include','mingw')]
 +			env['LIBPATH_WINPOSIX']   = [ env.join(os.getcwd(),winposixdir,'lib')]
+			env['LIB_WINPOSIX']       = [ winposixlib,'ws2_32']
 
-		env['CACHED_LIBWINPOSIX'] = 1
+		env['CACHED_WINPOSIX'] = 1
 		opts.Save(optionFile, env)
 
-	if env.has_key('CCFLAGS_LIBWINPOSIX'):
-		env.AppendUnique( CCFLAGS  = env['CCFLAGS_LIBWINPOSIX'] )
-	if env.has_key('LFLAGS_LIBWINPOSIX'):
-		env.AppendUnique( LINKFLAGS = env['LFLAGS_LIBWINPOSIX'] )
\ No newline at end of file
+	# add winposix to environment by default 
+	if env.has_key('CACHED_WINPOSIX') and env['CACHED_WINPOSIX']:
+		env.AppendUnique( CPPPATH = env['CPPPATH_WINPOSIX'] )
+		env.AppendUnique( LIBPATH = env['LIBPATH_WINPOSIX'] )
+		env.AppendUnique( LIBS = env['LIB_WINPOSIX'] )
\ No newline at end of file
--- trunk/KDE/kdelibs/bksys/lowlevel.py #507499:507500
@@ -138,10 +138,6 @@
 
 	conf = env.Configure()
 	
-	# for gcc the libraries must be located after the object files, otherwise they will \
                not be found
-	if env['WINDOWS'] and env['CC'] == 'gcc':
-		conf.env['LINKCOM'] = '$LINK -o $TARGET $SOURCES $LINKFLAGS $_LIBDIRFLAGS \
                $_LIBFLAGS'
-
 	content = ""
 	define_regex = re.compile("(\\.|\\/|\\\\)")
 	for header in headers:


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