Merge remote-tracking branch 'origin/master'

nickgammon · Feb 1, 2017 · 4dde2b1 · 4dde2b1
2 parents a57ce19 + 7f409af
commit 4dde2b1
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 4 deletions.
diff --git a/MUSHclient.vcxproj b/MUSHclient.vcxproj
@@ -135,6 +135,11 @@
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <OmitFramePointers>true</OmitFramePointers>
+      <EnableParallelCodeGeneration>true</EnableParallelCodeGeneration>
+      <FloatingPointModel>Fast</FloatingPointModel>
+      <CompileAsManaged>false</CompileAsManaged>
+      <AdditionalOptions>/GA</AdditionalOptions>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -147,6 +152,10 @@
       <ProgramDatabaseFile>.\WinRel/MUSHclient.pdb</ProgramDatabaseFile>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
     </Link>
     <Bscmake>
       <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -1446,4 +1455,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
diff --git a/install/mushclient.nsi b/install/mushclient.nsi
@@ -1,5 +1,5 @@
 ; -------- MUSHclient install script
-; For use with NSIS installer (see www.nullsort.com)
+; For use with NSIS installer (see https://sourceforge.net/projects/nsis/)
 
 ;
 ;  get a local copy of the .exe and compress it

diff --git a/stdafx.h b/stdafx.h
@@ -23,7 +23,7 @@
 #pragma warning (disable : 4786)  // identifier was truncated to 'number' characters in the debug information
 #pragma warning (disable : 4996)  // MBCS support in MFC is deprecated and may be removed in a future version of MFC
 
-
+#define _AFX_NO_MFC_CONTROLS_IN_DIALOGS
 #define VC_EXTRALEAN		// Exclude rarely-used stuff from Windows headers
 #define HAVE_CONFIG_H   // for PCRE
 
@@ -884,4 +884,4 @@ typedef struct
     {
     LUALIB_API int (luaL_typerror) (lua_State *L, int narg, const char *tname);
     }
-#endif // LUA_52
+#endif // LUA_52