Commit graph

89 commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
pabs3
8666849f94 Fix FTBFS on Debian GNU/Linux amd64 due to not enough use of -m32
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@5565 212acab6-be3b-0410-9dea-997c60f758d6
2008-03-03 16:33:56 +00:00
pabs3
018b9cc347 Add Debian patch for separate stripping options for Win32 & cross-platform options
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@5368 212acab6-be3b-0410-9dea-997c60f758d6
2007-11-14 06:20:44 +00:00
kichik
16280a6389 check compiler flag `-m32' before linker flag as some gcc versions crash when linking non 32-bit objects with this flag
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@5336 212acab6-be3b-0410-9dea-997c60f758d6
2007-10-14 21:25:57 +00:00
kichik
70e0fec9e5 fixed bug #1800834 - CVS FTBFS with new mingw32
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@5294 212acab6-be3b-0410-9dea-997c60f758d6
2007-09-29 10:13:07 +00:00
kichik
8e716ed458 applied patch #1758863 - Patch for building on GCC and aCC
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@5217 212acab6-be3b-0410-9dea-997c60f758d6
2007-07-23 18:43:07 +00:00
kichik
44e366f9da changed __ALLOW_UNALIGNED_DATA_ACCESS__ to NSIS_HPUX_ALLOW_UNALIGNED_DATA_ACCESS
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@5182 212acab6-be3b-0410-9dea-997c60f758d6
2007-06-27 14:16:07 +00:00
kichik
81afed0591 applied patch #1714416 - patch to build on hpux
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@5181 212acab6-be3b-0410-9dea-997c60f758d6
2007-06-27 14:15:00 +00:00
kichik
bebb041789 more of bug #1676243 - compiler warnings on Linux
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@5066 212acab6-be3b-0410-9dea-997c60f758d6
2007-04-13 10:29:24 +00:00
kichik
3608995944 added -Wno-non-virtual-dtor for 7zip files on gnu configuration for bug #1676243
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@5051 212acab6-be3b-0410-9dea-997c60f758d6
2007-04-11 20:54:00 +00:00
kichik
7b6071caec more of bug #1635841 - gcc strict-aliasing and build system
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@5000 212acab6-be3b-0410-9dea-997c60f758d6
2007-03-18 18:34:03 +00:00
kichik
9fc8466b7c listing file is fun
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@4979 212acab6-be3b-0410-9dea-997c60f758d6
2007-03-06 21:14:12 +00:00
kichik
b293ebb229 added MSVCRT_FLAG
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@4963 212acab6-be3b-0410-9dea-997c60f758d6
2007-03-02 11:17:08 +00:00
kichik
1a7016361c applied patch #1667950 - Silence spurious warnings when compiling with VC8
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@4957 212acab6-be3b-0410-9dea-997c60f758d6
2007-02-24 18:23:33 +00:00
kichik
82910689b3 fixed bug #1646170 - nsis-2.23 can be built on x86_64 hosts
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@4920 212acab6-be3b-0410-9dea-997c60f758d6
2007-02-02 22:53:07 +00:00
kichik
bd86ee1bfc fixed bug #1635841 - gcc strict-aliasing and build system
- added STRIP, APPEND_CCFLAGS and APPEND_LINKFLAGS command line options
 - added -fno-strict-aliasing to stubs and plug-ins


git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@4863 212acab6-be3b-0410-9dea-997c60f758d6
2007-01-23 17:01:54 +00:00
kichik
f03e32fc2f MSVC_VERSION has Exp prefix for express versions
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@4825 212acab6-be3b-0410-9dea-997c60f758d6
2006-11-27 14:38:16 +00:00
kichik
7519ae9fe2 proper MSVS_VERSION check
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@4817 212acab6-be3b-0410-9dea-997c60f758d6
2006-11-17 11:38:15 +00:00
joostverburg
f04bd2fa14 automatic MSVC 2005 detection
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@4816 212acab6-be3b-0410-9dea-997c60f758d6
2006-11-14 19:14:53 +00:00
joostverburg
40df19f5e8 * SCons 0.96.93 automatically detects MSVC 2005, using environment variables is no longer needed
* Use new exception flag for MSVC 2005


git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@4814 212acab6-be3b-0410-9dea-997c60f758d6
2006-11-13 14:10:11 +00:00
kichik
4bdb1ebd7d Copy is deprecated by Clone in scons 0.96.93
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@4813 212acab6-be3b-0410-9dea-997c60f758d6
2006-11-11 13:04:35 +00:00
kichik
5db3e30206 proper memset test
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@4800 212acab6-be3b-0410-9dea-997c60f758d6
2006-10-30 20:50:30 +00:00
joostverburg
3c3e42020b Disabled libcp check for MSVC 2005. This lib is not used anymore.
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@4797 212acab6-be3b-0410-9dea-997c60f758d6
2006-10-29 14:52:22 +00:00
joostverburg
1247550061 MSVC 2005 support. Add TEMP_MSVC2005=yes to the build command line.
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@4796 212acab6-be3b-0410-9dea-997c60f758d6
2006-10-29 11:50:31 +00:00
kichik
a7d4d32640 scons 0.96.92
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@4776 212acab6-be3b-0410-9dea-997c60f758d6
2006-10-17 16:59:03 +00:00