dragonleo/NSIS
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

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)

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

8
Contrib/NSIS Menu/SConscript
View file

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

3000
Contrib/NSIS Menu/wx/setup.h
View file

File diff suppressed because it is too large Load diff

13
Contrib/NSIS Menu/wx/wxbuild.bat
View file

@ -6,8 +6,9 @@ cd /D "%WXWIN%\build\msw"
rem Save the old setup.h as old_setup.h in the starting dir. rem Save the old setup.h as old_setup.h in the starting dir.
copy /y "%WXWIN%\include\wx\msw\setup.h" "%OLDCD%\old_setup.h" copy /y "%WXWIN%\include\wx\msw\setup.h" "%OLDCD%\old_setup.h"
if "%1" == "unicode" goto unicode if "%1"=="unicode" goto unicode
if "%1" == "ansi" goto ansi if "%1"=="ansi" goto ansi
:ansi :ansi
rem Ask if we want to delete this dir. rem Ask if we want to delete this dir.
echo Deleting... echo Deleting...
@ -19,8 +20,8 @@ copy /y "%OLDCD%\setup.h" "%WXWIN%\include\wx\msw\setup.h"
echo Deleting... echo Deleting...
rd /S vc_mswnsis rd /S vc_mswnsis
nmake -f makefile.vc CFG=nsis BUILD=release RUNTIME_LIBS=static SHARED=0 UNICODE=0 WXUNIV=0 USE_OPENGL=0 USE_ODBC=0 USE_HTML=1 USE_XRC=0 nmake -f makefile.vc CFG=nsis BUILD=release RUNTIME_LIBS=static SHARED=0 UNICODE=0 WXUNIV=0 USE_OPENGL=0 USE_ODBC=0 USE_HTML=1 USE_XRC=0
if "%1" == "" goto unicode if "%1"=="" goto unicode
if "%1" == "all" goto unicode if "%1"=="all" goto unicode
goto finish goto finish
:unicode :unicode
@ -30,9 +31,9 @@ rd /S ..\..\lib\vc_libunsis
echo ### building UNICODE version ### echo ### building UNICODE version ###
rem Copy the UNICODE version of setup.h to WXWIN setup. rem Copy the UNICODE version of setup.h to WXWIN setup.
copy /y "%OLDCD%\setup_unicode.h" "%WXWIN%\include\wx\msw\setup.h" copy /y "%OLDCD%\setup.h" "%WXWIN%\include\wx\msw\setup.h"
echo Deleting... echo Deleting...
rd /S vc_mswunsis rd /S vc_mswuunsis
nmake -f makefile.vc CFG=unsis BUILD=release RUNTIME_LIBS=static SHARED=0 UNICODE=1 WXUNIV=0 USE_OPENGL=0 USE_ODBC=0 USE_HTML=1 USE_XRC=0 nmake -f makefile.vc CFG=unsis BUILD=release RUNTIME_LIBS=static SHARED=0 UNICODE=1 WXUNIV=0 USE_OPENGL=0 USE_ODBC=0 USE_HTML=1 USE_XRC=0
:finish :finish