Changeset 226 for SConstruct

Timestamp:

04/05/11 15:01:41 (14 years ago)

Author:

tim

Message:

several fixes for pyregfi Windows portability
better error handling within pyregfi

File:

• SConstruct (modified) (3 diffs)

SConstruct

@@ -1 @@
-cflags = '-std=gnu99 -pedantic -Wall'
+cflags = '-std=gnu99 -pedantic -Wall -D_FILE_OFFSET_BITS=64 -DREGFI_WIN32'
 
 libiconv_path='win32/libiconv/'
@@ -100 +100 @@
                 regfi_obj.append(s[0:-1]+'o')
 
+            # XXX: Several options here may not be necessary.  
+            #      Need to investigate why stdcall interfaces don't seem to be 
+            #      working on Windows.
             env.Command(input_prefix+'lib/libregfi.o', regfi_o+extra_obj,
                         'i586-mingw32msvc-dlltool --export-all-symbols'
-                        +' --dllname libregfi.dll -e $TARGET'
+                        +' --add-stdcall-alias  --dllname libregfi.dll -e $TARGET'
                         +' -l %slib/libregfi.dll.a %s' 
                         % (input_prefix, ' '.join(regfi_obj)))
@@ -108 +111 @@
             env.Command(input_prefix+'lib/libregfi.dll',
                         input_prefix+'lib/libregfi.o',
-                        'i586-mingw32msvc-gcc --shared -o $TARGET $SOURCE %s'
+                        'i586-mingw32msvc-gcc ' + cflags 
+                        + ' --shared -Wl,--out-implib -add-stdcall-alias -o $TARGET $SOURCE %s'
                         % ' '.join(regfi_obj+extra_obj))