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

Source/7zip/7zGuids.cpp

@@ -21,13 +21,16 @@
 
 // #include "StdAfx.h"
 
-#ifdef WIN32
-#  include <objbase.h>
+#ifdef _WIN32
 #  include <initguid.h>
+#  include <objbase.h>
+#endif
+
+#ifndef INITGUID
+#  define INITGUID
 #endif
 
 #include "../Platform.h"
 
-#define INITGUID
 #include "7zip/ICoder.h"
 #include "7zip/Compress/LZ/IMatchFinder.h"

Source/7zip/Common/MyGuidDef.h

@@ -47,14 +47,14 @@ inline bool operator==(REFGUID g1, REFGUID g2)
 inline bool operator!=(REFGUID g1, REFGUID g2) { return !(g1 == g2); }
 #endif
 
+#endif // GUID_DEFINED
+
 #ifdef __cplusplus
   #define MY_EXTERN_C extern "C"
 #else
   #define MY_EXTERN_C extern
 #endif
 
-#endif // GUID_DEFINED
-
 
 #ifdef DEFINE_GUID
 #undef DEFINE_GUID