From 5b9682275e384635a1fd9f7320cf4d9a604a43b4 Mon Sep 17 00:00:00 2001 From: ChrisTX Date: Fri, 12 Oct 2012 22:31:38 +0200 Subject: Windows: In-depth cleanup (see details) -Fix x64 builds for Windows. Now all configurations compile. -Remove the non-working rebase stuff. -Remove the Windows fork hack and instead use FreeConsole() to emulate the behavior. This directly allows us to compile with ASLR, which is turned on now. -Remove the old IPC mechanism for the removed GUI. This is not needed anymore as the GUI wasn't ever supported on anything newer than 1.2 -Remove the WIN32/WINDOWS macros. _WIN32 is supported on all x86-based VC++ targets, so that's what we need. -Enable optimizations for release builds. -De-duplicate printf_c(), it was previously copy-pasted into colors.h for configure -Add the VC++ specific bad files in .gitignore -Disable PID writing on Windows. This is only making sense for *nix builds. -Replace the CPU usage retrieval with an algorithm analogous to the *nix behavior. Also supports separated now/total values. (Tested with a dummy busy loop - seems working) -Removed certain unused functions and variables -Remove stdint defines from the windows wrapper -Remove CRT debug alloc. This is a bad idea as it would define a macro to replace free which breaks builds. -Re-evaluated the warnings list, commented it. -Moved inspircd_config/_version to include/ to match *nix -Removed the creation of inspircd_se_config, as it isn't used at all. -Made non-git builds show as "r0" instead of "r" (thanks to @SaberUK for pointing this out) -Fixed up m_spanningtree's project paths. Now all configurations (debug/release x86/x64) have been tested and build properly. -Moved FindDNS out of the wrapper and matched its log behavior with *nix. (It's pointless having it in the wrapper after the recent slimming down) -Replaced random/srandom wrappers with a mechanism that tries to use Windows' Random API first is no SSL module is loaded. -Removed more old junk from support for compilers older than VC++ 2010 (we don't have project files for these, so compiling them would be hard anyways) -Removed the unused ClearConsole() -Removed unused includes from the wrapper. Also, do not include psapi.h here if we don't link psapi.lib. This should be done where appropriate. -Made inet_aton an inline function for increased performance -C4800, performance warning about bool forcing, resolved at all occurrences. -C4701, uninitialized variable 'cached', resolved at all occurrences. -dlerror() was migrated out of the wrapper for more thread safety (no global buffer being shared) and increased performance. -Removed the wrong CRT debug flags. This drains a lot of performance. -Removed the clock_gettime/gettimeofday wrappers -Replaced all TCHAR/ANSI mix-ups of functions with the correct respective function. -Added a block of C4355 for < VS2012 -Update project files for c870714 --- win/m_spanningtree.vcxproj | 58 ++++++++++++++++++++++------------------------ 1 file changed, 28 insertions(+), 30 deletions(-) (limited to 'win/m_spanningtree.vcxproj') diff --git a/win/m_spanningtree.vcxproj b/win/m_spanningtree.vcxproj index 294b744f6..e66693367 100644 --- a/win/m_spanningtree.vcxproj +++ b/win/m_spanningtree.vcxproj @@ -102,24 +102,24 @@ Disabled - ..\include;..\win;..\src\modules\m_spanningtree;.;..\src\modules;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;DLL_BUILD;%(PreprocessorDefinitions) + ..\include;..\win;..\src\modules;%(AdditionalIncludeDirectories) + _DEBUG;_USRDLL;DLL_BUILD;%(PreprocessorDefinitions) false EnableFastChecks MultiThreadedDebugDLL - Level3 + Level4 ProgramDatabase true - ws2_32.lib;inspircd.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;%(AdditionalDependencies) + inspircd.lib;%(AdditionalDependencies) ..\bin\debug\;%(AdditionalLibraryDirectories) true $(OutDir)m_spanningtree.pdb Windows - false + true $(OutDir)m_spanningtree.lib @@ -132,23 +132,24 @@ Disabled - ..\include;..\win;..\src\modules\m_spanningtree;.;..\src\modules;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;DLL_BUILD;WIN64;%(PreprocessorDefinitions) - true + ..\include;..\win;..\src\modules;%(AdditionalIncludeDirectories) + _DEBUG;_USRDLL;DLL_BUILD;%(PreprocessorDefinitions) + false EnableFastChecks MultiThreadedDebug - Level3 + Level4 ProgramDatabase + true - ws2_32.lib;inspircd.lib;%(AdditionalDependencies) - ..\bin\debug_x64\bin;..\bin\debug_x64\lib;%(AdditionalLibraryDirectories) + inspircd.lib;%(AdditionalDependencies) + ..\bin\debug_x64;%(AdditionalLibraryDirectories) true $(OutDir)m_spanningtree.pdb Windows - false + true $(OutDir)m_spanningtree.lib @@ -158,61 +159,58 @@ /MP %(AdditionalOptions) - MinSpace + MaxSpeed true - ..\include;..\win;.;..\src\modules;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;M_SPANNINGTREE_EXPORTS;DLL_BUILD;%(PreprocessorDefinitions) + ..\include;..\win;..\src\modules;%(AdditionalIncludeDirectories) + NDEBUG;_USRDLL;DLL_BUILD;%(PreprocessorDefinitions) false MultiThreadedDLL Level2 ProgramDatabase + true - ws2_32.lib;inspircd.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;%(AdditionalDependencies) + inspircd.lib;%(AdditionalDependencies) ..\bin\release\;%(AdditionalLibraryDirectories) true Windows true true UseLinkTimeCodeGeneration - false + true $(OutDir)m_spanningtree.lib MachineX86 - - Re-basing shared objects... - @cd $(ProjectDir) -@"$(ProjectDir)\rebase.bat" - - X64 - Disabled - ..\include;..\win;..\src\modules\m_spanningtree;.;..\src\modules;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;M_SPANNINGTREE_EXPORTS;DLL_BUILD;%(PreprocessorDefinitions) - true + MaxSpeed + ..\include;..\win;..\src\modules;%(AdditionalIncludeDirectories) + NDEBUG;_USRDLL;DLL_BUILD;%(PreprocessorDefinitions) + false MultiThreaded Level2 ProgramDatabase + true + true - ws2_32.lib;inspircd.lib;%(AdditionalDependencies) - ..\bin\release_x64\bin;..\bin\release_x64\lib;%(AdditionalLibraryDirectories) + inspircd.lib;%(AdditionalDependencies) + ..\bin\release_x64\;%(AdditionalLibraryDirectories) true Windows true true - false + true $(OutDir)m_spanningtree.lib -- cgit v1.2.3