diff options
author | brain <brain@e03df62e-2008-0410-955e-edbf42e46eb7> | 2008-04-21 16:59:23 +0000 |
---|---|---|
committer | brain <brain@e03df62e-2008-0410-955e-edbf42e46eb7> | 2008-04-21 16:59:23 +0000 |
commit | 98659aa0dcac7636627846555ef7d5f807152b7e (patch) | |
tree | 4726b3771ad6874862f2ff7b503264eed617f8d4 /win | |
parent | f21617328a8a576c8ada619f2934ac31f0dec717 (diff) |
Merge in large patchset from GreenReaper, useful fixes for freeing a ton of different things on shutdown for tidyness, and a few stack corruption fixes in the mode handler
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@9565 e03df62e-2008-0410-955e-edbf42e46eb7
Diffstat (limited to 'win')
-rw-r--r-- | win/configure.cpp | 12 | ||||
-rw-r--r-- | win/m_spanningtreeVC80.vcproj | 61 |
2 files changed, 40 insertions, 33 deletions
diff --git a/win/configure.cpp b/win/configure.cpp index a7351739e..a6dab1ffd 100644 --- a/win/configure.cpp +++ b/win/configure.cpp @@ -552,7 +552,11 @@ void WriteCompileCommands() #endif #endif - fprintf(f, "makedir:\n if not exist debug mkdir debug\n if not exist release mkdir release\n\n"); +#ifdef _DEBUG + fprintf(f, "makedir:\n if not exist debug mkdir debug\n if not exist ..\\..\\bin\\debug\\lib mkdir ..\\..\\bin\\debug\\lib\n\n"); +#else + fprintf(f, "makedir:\n if not exist release mkdir release\n if not exist ..\\..\\bin\\release\\lib mkdir ..\\..\\bin\\release\\lib\n\n"); +#endif // dump modules.. again the second and last time :) for(int i = 0; i < command_count; ++i) @@ -623,7 +627,11 @@ void WriteCompileModules() #endif #endif - fprintf(f, "makedir:\n if not exist debug mkdir debug\n if not exist release mkdir release\n\n"); +#ifdef _DEBUG + fprintf(f, "makedir:\n if not exist debug mkdir debug\n if not exist ..\\..\\bin\\debug\\modules mkdir ..\\..\\bin\\debug\\modules\n\n"); +#else + fprintf(f, "makedir:\n if not exist release mkdir release\n if not exist ..\\..\\bin\\release\\modules mkdir ..\\..\\bin\\release\\modules\n\n"); +#endif // dump modules.. again the second and last time :) for(int i = 0; i < module_count; ++i) diff --git a/win/m_spanningtreeVC80.vcproj b/win/m_spanningtreeVC80.vcproj index 2367ef4ec..2477756d9 100644 --- a/win/m_spanningtreeVC80.vcproj +++ b/win/m_spanningtreeVC80.vcproj @@ -101,9 +101,9 @@ />
</Configuration>
<Configuration
- Name="Release|Win32"
- OutputDirectory="..\bin\release\modules"
- IntermediateDirectory="Release"
+ Name="Debug|x64"
+ OutputDirectory="..\bin\debug_x64\modules"
+ IntermediateDirectory="x64Debug_spanningtree"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
CharacterSet="2"
@@ -122,18 +122,18 @@ />
<Tool
Name="VCMIDLTool"
+ TargetEnvironment="3"
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalOptions="/MP"
- Optimization="1"
- WholeProgramOptimization="true"
+ Optimization="0"
AdditionalIncludeDirectories="..\include;..\win;..\src\modules\m_spanningtree;.;..\src\modules"
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;M_SPANNINGTREE_EXPORTS;DLL_BUILD"
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;DLL_BUILD;WIN64"
MinimalRebuild="true"
- RuntimeLibrary="2"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="1"
UsePrecompiledHeader="0"
- WarningLevel="2"
+ WarningLevel="3"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="3"
/>
@@ -148,18 +148,15 @@ />
<Tool
Name="VCLinkerTool"
- AdditionalOptions="/MD"
- AdditionalDependencies="ws2_32.lib inspircd.lib cmd_whois.lib cmd_stats.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib"
+ AdditionalDependencies="ws2_32.lib inspircd.lib cmd_whois.lib cmd_stats.lib"
OutputFile="$(OutDir)/m_spanningtree.so"
LinkIncremental="1"
- AdditionalLibraryDirectories="..\bin\release\bin;..\bin\release\lib"
+ AdditionalLibraryDirectories="..\bin\debug_x64\bin;..\bin\debug_x64\lib"
GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(OutDir)/m_spanningtree.pdb"
SubSystem="2"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- LinkTimeCodeGeneration="1"
ImportLibrary="$(OutDir)/m_spanningtree.lib"
- TargetMachine="1"
+ TargetMachine="17"
/>
<Tool
Name="VCALinkTool"
@@ -184,14 +181,12 @@ />
<Tool
Name="VCPostBuildEventTool"
- Description="Re-basing shared objects..."
- CommandLine="@cd $(InputDir)
@$(InputDir)\rebase.bat
"
/>
</Configuration>
<Configuration
- Name="Debug|x64"
- OutputDirectory="..\bin\debug_x64\modules"
- IntermediateDirectory="x64Debug_spanningtree"
+ Name="Release|Win32"
+ OutputDirectory="..\bin\release\modules"
+ IntermediateDirectory="Release"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
CharacterSet="2"
@@ -210,18 +205,17 @@ />
<Tool
Name="VCMIDLTool"
- TargetEnvironment="3"
/>
<Tool
Name="VCCLCompilerTool"
- Optimization="0"
+ Optimization="1"
+ WholeProgramOptimization="true"
AdditionalIncludeDirectories="..\include;..\win;..\src\modules\m_spanningtree;.;..\src\modules"
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;DLL_BUILD;WIN64"
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;M_SPANNINGTREE_EXPORTS;DLL_BUILD"
MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="1"
+ RuntimeLibrary="2"
UsePrecompiledHeader="0"
- WarningLevel="3"
+ WarningLevel="2"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="3"
/>
@@ -236,15 +230,18 @@ />
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="ws2_32.lib inspircd.lib cmd_whois.lib cmd_stats.lib"
+ AdditionalOptions="/MD"
+ AdditionalDependencies="ws2_32.lib inspircd.lib cmd_whois.lib cmd_stats.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib"
OutputFile="$(OutDir)/m_spanningtree.so"
LinkIncremental="1"
- AdditionalLibraryDirectories="..\bin\debug_x64\bin;..\bin\debug_x64\lib"
+ AdditionalLibraryDirectories="..\bin\release\bin;..\bin\release\lib"
GenerateDebugInformation="true"
- ProgramDatabaseFile="$(OutDir)/m_spanningtree.pdb"
SubSystem="2"
+ OptimizeReferences="2"
+ EnableCOMDATFolding="2"
+ LinkTimeCodeGeneration="1"
ImportLibrary="$(OutDir)/m_spanningtree.lib"
- TargetMachine="17"
+ TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
@@ -269,6 +266,8 @@ />
<Tool
Name="VCPostBuildEventTool"
+ Description="Re-basing shared objects..."
+ CommandLine="@cd $(InputDir)
@"$(InputDir)\rebase.bat"
"
/>
</Configuration>
<Configuration
|