upgraded to wxWidgets 2.9.4 and fixed unicode build (files were written into vc_mswuunsis and not vc_mswunsis; and some of the IF statement in the batch file didn't work)

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6331 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
kichik 2013-04-10 09:13:20 +00:00
parent 514f28995e
commit 3d42178659
3 changed files with 1660 additions and 1361 deletions

View file

@ -21,9 +21,9 @@ libs = Split("""
""")
if env['UNICODE']:
libs.append(["wxbase28u", "wxmsw28u_core", "wxmsw28u_html"])
libs.append(["wxbase29u", "wxmsw29u_core", "wxmsw29u_html"])
else:
libs.append(["wxbase28", "wxmsw28_core", "wxmsw28_html"])
libs.append(["wxbase29", "wxmsw29_core", "wxmsw29_html"])
html = Split("""
#Menu/index.html
@ -52,9 +52,9 @@ if env['PLATFORM'] != 'win32' and WhereIs('wx-config') or \
libs,
res = rc,
resources = resources,
flags = ['$MSVCRT_FLAG', '$EXCEPTION_FLAG'],
flags = ['$EXCEPTION_FLAG'],
root_util = True,
cross_platform = True
cross_platform = True,
)
# manifest