fixed iconv.dll build on win32

1 files changed, 21 insertions, 5 deletions

diff --git a/SConstruct b/SConstruct
index 3f7f073..86012a0 100644
--- a/SConstruct
+++ b/SConstruct
@@ -19,10 +19,20 @@ env.AppendUnique(CCFLAGS = ['-Wall', '-g'],
 
 uniconv = env.ConvenienceLibrary ('uniconv', srcs)
 
-iconv = env.SharedLibrary('iconv', 'iconv.c',
-                          LIBS = ['uniconv'],
-                          LIBPATH = ['.'],
-                          CPPPATH = ['.'])
+iconv_env = env.Clone()
+iconv_src = ['iconv.c']
+if iconv_env['PLATFORM'] == 'win32':
+    iconv_def = os.path.join('win32', 'iconv.def')
+    if 'gcc' in iconv_env['CC']:
+        iconv_src.append(iconv_def)
+    else:
+        iconv_env.AppendUnique(LINKFLAGS = ['/DEF:' + iconv_def])
+    iconv_env.AppendUnique(CPPDEFINES = ['UNICONV_REPLACE_ICONV'])
+
+iconv = iconv_env.SharedLibrary('iconv', iconv_src,
+                                LIBS = ['uniconv'],
+                                LIBPATH = ['.'],
+                                CPPPATH = ['.'])
 
 test = env.Program ('test', 'main.c',
                     LIBS = ['uniconv'],
@@ -32,4 +42,10 @@ conv = env.Program ('uconv', 'uconv.c',
                     LIBS = ['uniconv'],
                     LIBPATH = ['.'],
                     CPPPATH = ['.'])
-conv2 = bareenv.Program ('uconv2', 'uconv2.c')
+
+conv2_env = bareenv.Clone()
+if env['PLATFORM'] == 'win32':
+    conv2_env.AppendUnique(CPPPATH = ['win32'],
+                           LIBS = ['iconv'],
+                           LIBPATH = ['.'])
+conv2 = conv2_env.Program ('uconv2', 'uconv2.c')