From 7455caa968fbd6473d278d0c21ed6a3d1560d157 Mon Sep 17 00:00:00 2001 From: kichik Date: Sat, 23 Apr 2005 19:15:22 +0000 Subject: [PATCH] use new zlib files git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@3990 212acab6-be3b-0410-9dea-997c60f758d6 --- Contrib/zip2exe/SConscript | 28 ++++++++++------------------ 1 file changed, 10 insertions(+), 18 deletions(-) diff --git a/Contrib/zip2exe/SConscript b/Contrib/zip2exe/SConscript index 3aa9c818..9d28e14b 100644 --- a/Contrib/zip2exe/SConscript +++ b/Contrib/zip2exe/SConscript @@ -1,20 +1,15 @@ target = "zip2exe" -cpp_files = Split(""" +files = Split(""" main.cpp -""") - -c_files = Split(""" - zlib/ADLER32.C - zlib/CRC32.C - zlib/INFBLOCK.C - zlib/INFCODES.C - zlib/INFFAST.C - zlib/INFLATE.C - zlib/INFTREES.C - zlib/INFUTIL.C - zlib/Unzip.c - zlib/Zutil.c + zlib/adler32.c + zlib/crc32.c + zlib/inffast.c + zlib/inflate.c + zlib/inftrees.c + zlib/ioapi.c + zlib/unzip.c + zlib/zutil.c """) resources = Split(""" @@ -33,9 +28,6 @@ libs = Split(""" shell32 """) -Import('BuildUtil env') - -env.Append(CPPFLAGS = '$C_FLAG') -files = env.Object(c_files) + cpp_files +Import('BuildUtil') BuildUtil(target, files, libs, res = rc, resources = resources, install = 'Bin')