Changeset 243

Timestamp:

04/29/11 18:35:44 (14 years ago)

Author:

tim

Message:

win32 fixes

File:

• SConstruct (modified) (3 diffs)

SConstruct

@@ -62 +62 @@
 cp %s/python/pyregfi/*.py .release/%s/python/pyregfi
 
-cp .export/win32/libiconv/bin/*.dll .export/win32/libpthreads/bin/*.dll .export/win32/libtalloc/bin/*.dll trunk/lib/*.dll .release/%s
+cp .export/win32/libiconv/bin/*.dll .export/win32/libpthreads/bin/*.dll .export/win32/libtalloc/bin/*.dll %s/lib/*.dll .release/%s
 cd .release && zip -r %s.zip %s
 mv .release/%s.zip . && rm -rf .release
@@ -85 +85 @@
             env['RANLIB']='i586-mingw32msvc-ranlib'
             
-            env['CFLAGS']=cflags
+            env['CFLAGS']="""%s -DREGFI_VERSION='"%s"'""" % (cflags, version)
             env['CPPPATH']=[input_prefix+'include', 
                             libiconv_path+'include',
@@ -136 +136 @@
 
             ret_val += win32_cmds % (t_base,input_prefix,t_base,input_prefix,
-                                     t_base,input_prefix,t_base,
+                                     t_base,input_prefix,t_base,input_prefix,
                                      t_base,t_base,t_base,t_base)