Commit graph

133 commits

Author SHA1 Message Date
anders_k
d43e3a717c mstoolkit toolchain should use the VC toolkit linker by default. link.exe can even stand in for lib.exe if required
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6504 212acab6-be3b-0410-9dea-997c60f758d6
2014-06-23 19:15:59 +00:00
anders_k
da7d67e69d CreateShortCut > CreateShortcut
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6453 212acab6-be3b-0410-9dea-997c60f758d6
2014-03-28 16:21:39 +00:00
anders_k
a7076ff238 Basic AMD64 System::Call support
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6444 212acab6-be3b-0410-9dea-997c60f758d6
2014-03-03 18:10:53 +00:00
anders_k
07183c43a9 Prevent MSVC 14.00.40310 from generating a recursive call to memset
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6442 212acab6-be3b-0410-9dea-997c60f758d6
2014-02-09 23:12:52 +00:00
anders_k
d799ee53d7 Basic Win64 support (MSVC)
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6439 212acab6-be3b-0410-9dea-997c60f758d6
2014-02-08 00:13:52 +00:00
kichik
410b1b7a7a avoid warnings about stdcall being ignored
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6434 212acab6-be3b-0410-9dea-997c60f758d6
2014-02-02 00:36:13 +00:00
anders_k
9b3a98a07f mstoolkit.py now supports MSVC_USE_SCRIPT=None to import VC and SDK paths from environment variables
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6428 212acab6-be3b-0410-9dea-997c60f758d6
2014-01-21 14:21:26 +00:00
anders_k
52a8b320ef POSIX fixes for native and crossplatform utils
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6427 212acab6-be3b-0410-9dea-997c60f758d6
2014-01-21 14:13:00 +00:00
anders_k
be6c7e6a1d Major POSIX overhaul
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6416 212acab6-be3b-0410-9dea-997c60f758d6
2013-12-08 14:34:38 +00:00
kichik
75405adb9d fix mingw env for unicode too
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6296 212acab6-be3b-0410-9dea-997c60f758d6
2013-03-13 08:22:56 +00:00
kichik
6d71b946e3 tdefenv must be defined after defenv is ready
this caused tdefenv (and therefore util_env) not to contain the right pointers to libcp.lib

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6282 212acab6-be3b-0410-9dea-997c60f758d6
2012-11-11 04:33:52 +00:00
kichik
cc12f76610 not sure how this ever worked, but it's LIBPATH that needs to be modified and LIB in the OS environment
maybe older versions of scons read LIB after environment construction too?

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6270 212acab6-be3b-0410-9dea-997c60f758d6
2012-10-15 02:34:25 +00:00
anders_k
7cc150c464 MakeNSIS can now generate Unicode or Ansi installers based on a script attribute. SCons generates both Ansi and Unicode stubs and plugins.
The official plugins are now stored in architecture specific subdirectories under NSIS\Plugins. !AddPluginDir also gained a new (optional) architecture flag because MakeNSIS now stores separate plugin information for each target architecture. Storing plugins in the root of the Plugins directory is no longer supported.

MinGW does not implement the unicode CRT startup functions so the entry point functions and linker parameters had to be changed. The unicode tools use the ansi entry point and a small helper function that calls into the real code: _tmain has full argc+argv emulation while wWinMain does not pass the command line parameters. The stubs do not use any CRT functions and have no CRT or unicode helper code, they call our entry point directly.



git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6269 212acab6-be3b-0410-9dea-997c60f758d6
2012-10-13 01:47:50 +00:00
anders_k
f2e3e13a0e MinGW: Don't link to LIBGCC*.DLL and LIBSTDC++-*.DLL
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6261 212acab6-be3b-0410-9dea-997c60f758d6
2012-09-11 00:53:50 +00:00
golubdr
667a2c8cae Fix indentation.
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6256 212acab6-be3b-0410-9dea-997c60f758d6
2012-08-22 23:39:06 +00:00
golubdr
957653f389 Use appropriate zlib DLL depending on version.
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6255 212acab6-be3b-0410-9dea-997c60f758d6
2012-08-22 23:32:05 +00:00
kichik
44f0a9e9e9 document the weird workaround
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6173 212acab6-be3b-0410-9dea-997c60f758d6
2011-11-15 23:12:24 +00:00
f0rt
737a5c8468 Allow building with a specific win32 targeted cross compiler (#3305366)
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6156 212acab6-be3b-0410-9dea-997c60f758d6
2011-06-25 19:29:38 +00:00
anders_k
fd1febb2f0 Fixes for MinGW (substart and system.dll still broken)
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6154 212acab6-be3b-0410-9dea-997c60f758d6
2011-06-15 22:48:02 +00:00
f0rt
b39f193c31 Avoid a clash when scons is run in parallel operation (#3295528)
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6151 212acab6-be3b-0410-9dea-997c60f758d6
2011-05-02 19:32:12 +00:00
kichik
2ef166a970 vc 10 doesn't like /opt:nowin98 or even /align:512
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6128 212acab6-be3b-0410-9dea-997c60f758d6
2010-11-13 21:13:49 +00:00
wizou
57f7ff8a1c Unicode port: Unicode version of NSIS can now generate both ANSI & Unicode installers (using new instruction UnicodeInstaller on/off).
Stubs & Plugins differentiation is done automatically using a 'W' suffix.
SConscripts need to be reviewed to generate both variants of Plugins & pluginapi.lib under Unicode compilation.

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6100 212acab6-be3b-0410-9dea-997c60f758d6
2010-06-14 10:07:22 +00:00
kichik
fcb399fce0 workaround for platform sdk problems with scons 1.3.0
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6062 212acab6-be3b-0410-9dea-997c60f758d6
2010-04-17 22:58:47 +00:00
kichik
8563f508c5 fixed nightly build
7.1... 7.1... not 8. what just happened here?

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6061 212acab6-be3b-0410-9dea-997c60f758d6
2010-04-17 21:42:29 +00:00
kichik
4af4fa9c73 fixed nightly build
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6060 212acab6-be3b-0410-9dea-997c60f758d6
2010-04-17 21:20:18 +00:00
wizou
cefeec3676 Additional error checking by Jim Park.
Also some cleaning.

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6058 212acab6-be3b-0410-9dea-997c60f758d6
2010-04-15 12:11:06 +00:00
wizou
01d88a1ed6 Some TCHAR fixes, linker flag for Unicode, and cosmetic touch without real changes
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6052 212acab6-be3b-0410-9dea-997c60f758d6
2010-04-14 10:15:40 +00:00
wizou
64a0f32e52 more simple TCHARs fixes
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6047 212acab6-be3b-0410-9dea-997c60f758d6
2010-04-12 16:00:17 +00:00
f0rt
8ab72b9ece #1753070: Enable that makensis and its related utilities can be built natively for 64-bit systems
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6040 212acab6-be3b-0410-9dea-997c60f758d6
2010-03-27 19:20:16 +00:00
wizou
cdf7735a77 Jim Park's Unicode NSIS merging - Step 2 : merge TCHARs changes into trunk
Compiler output is identical before & after this step

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6037 212acab6-be3b-0410-9dea-997c60f758d6
2010-03-26 17:18:17 +00:00
wizou
752d7d239a Jim Park's Unicode NSIS merging - Step 1 : switch to TCHARs where relevant.
Compiler output is identical before & after this step

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/branches/wizou@6036 212acab6-be3b-0410-9dea-997c60f758d6
2010-03-24 17:22:56 +00:00
f0rt
c39ffff404 applied patch #2918870 - use of the zlib compression library provided by the system
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6030 212acab6-be3b-0410-9dea-997c60f758d6
2010-02-07 21:24:09 +00:00
kichik
3d12aaa1f0 applied patch #2930854 - mingw compiled makensis: installers don't show bitmaps
(fixed plug-in compatibility with mingw 4.4)

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6028 212acab6-be3b-0410-9dea-997c60f758d6
2010-02-06 17:00:00 +00:00
kichik
6f8cb01206 proper flags order to avoid the horrible non-virtual destructor warning
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@5926 212acab6-be3b-0410-9dea-997c60f758d6
2009-02-05 00:52:28 +00:00
pabs3
f41ba95bab fix bug #2497148 - allow out of tree builds on POSIX platforms
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@5921 212acab6-be3b-0410-9dea-997c60f758d6
2009-02-04 14:05:48 +00:00
pabs3
bf6c65b158 Fix up plugin API header/lib installation for non-Windows platforms.
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@5904 212acab6-be3b-0410-9dea-997c60f758d6
2009-01-11 09:48:07 +00:00
kichik
521d9c2ced pydoc should be in the function
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@5903 212acab6-be3b-0410-9dea-997c60f758d6
2009-01-10 22:53:35 +00:00
kichik
c88bf59a8d make sure iconv exists
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@5902 212acab6-be3b-0410-9dea-997c60f758d6
2009-01-10 22:51:43 +00:00
kichik
af046c0116 and a dash
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@5901 212acab6-be3b-0410-9dea-997c60f758d6
2009-01-10 22:38:57 +00:00
kichik
b36d0f3e3f wrong prefix in bug report
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@5900 212acab6-be3b-0410-9dea-997c60f758d6
2009-01-10 22:29:18 +00:00
kichik
f43fc9d38a fink prefixes for bug #2495138
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@5899 212acab6-be3b-0410-9dea-997c60f758d6
2009-01-10 22:14:36 +00:00
kichik
59501c0174 scons 1.2.0 - Options -> Variables
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@5882 212acab6-be3b-0410-9dea-997c60f758d6
2008-12-24 23:40:38 +00:00
kichik
86bcd61baa again, force quotation around stdcall to avoid parenthesis madness
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@5848 212acab6-be3b-0410-9dea-997c60f758d6
2008-12-15 21:51:24 +00:00
kichik
6f5d687490 use lists instead of dicts so scons will not treat the dict as a string when a list is also appended
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@5847 212acab6-be3b-0410-9dea-997c60f758d6
2008-12-14 23:56:10 +00:00
kichik
a924c4d2d3 added support for lib building on cross mingw
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@5839 212acab6-be3b-0410-9dea-997c60f758d6
2008-12-12 17:57:54 +00:00
kichik
2d06f24c5d force quoting to avoid problems with the parenthesis
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@5818 212acab6-be3b-0410-9dea-997c60f758d6
2008-12-09 23:06:03 +00:00
kichik
f6e4fefbf5 moved NSISCALL detection to scons
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@5814 212acab6-be3b-0410-9dea-997c60f758d6
2008-12-09 22:42:12 +00:00
kichik
a91ab7ab59 spaces are now frowned upon and quoted for unknown reason
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@5783 212acab6-be3b-0410-9dea-997c60f758d6
2008-11-21 08:47:37 +00:00
kichik
4c87ec9e83 applied patch #2193442 - port System::Call and related functions to GCC
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@5775 212acab6-be3b-0410-9dea-997c60f758d6
2008-11-20 21:04:23 +00:00
kichik
c8884e0988 scons 1.1.0 support
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@5767 212acab6-be3b-0410-9dea-997c60f758d6
2008-11-15 21:54:24 +00:00