diff options
| -rw-r--r-- | win/inspircdVC80.vcproj | 77 | ||||
| -rw-r--r-- | win/m_spanningtreeVC80.vcproj | 61 | ||||
| -rw-r--r-- | win/resource.rc | 38 |
3 files changed, 110 insertions, 66 deletions
diff --git a/win/inspircdVC80.vcproj b/win/inspircdVC80.vcproj index 4e3cf25b2..2f17413d3 100644 --- a/win/inspircdVC80.vcproj +++ b/win/inspircdVC80.vcproj @@ -106,16 +106,17 @@ />
</Configuration>
<Configuration
- Name="Debug|x64"
- OutputDirectory="..\bin\debug_x64\bin"
- IntermediateDirectory="x64DebugVc80"
+ Name="Release|Win32"
+ OutputDirectory="..\bin\release\bin"
+ IntermediateDirectory="Release"
ConfigurationType="1"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
CharacterSet="2"
>
<Tool
Name="VCPreBuildEventTool"
- CommandLine=""
+ Description="running configure..."
+ CommandLine=""$(InputDir)\configure.exe""
/>
<Tool
Name="VCCustomBuildTool"
@@ -128,20 +129,20 @@ />
<Tool
Name="VCMIDLTool"
- TargetEnvironment="3"
/>
<Tool
Name="VCCLCompilerTool"
- Optimization="0"
+ AdditionalOptions="/MP"
+ Optimization="1"
+ WholeProgramOptimization="true"
AdditionalIncludeDirectories=".;../include;../../include;../include/modes;../include/commands;../../include/modes;../../include/commands;../win"
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WIN64"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="1"
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ MinimalRebuild="false"
+ RuntimeLibrary="2"
UsePrecompiledHeader="0"
WarningLevel="3"
- Detect64BitPortabilityProblems="true"
- DebugInformationFormat="3"
+ Detect64BitPortabilityProblems="false"
+ DebugInformationFormat="0"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -154,16 +155,16 @@ />
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="ws2_32.lib mswsock.lib"
- ShowProgress="0"
+ AdditionalDependencies="dbghelp.lib ws2_32.lib mswsock.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib"
OutputFile="$(OutDir)/inspircd.exe"
LinkIncremental="1"
- IgnoreDefaultLibraryNames=""
+ EmbedManagedResourceFile="inspircd.ico"
GenerateDebugInformation="true"
- ProgramDatabaseFile="$(OutDir)/inspircd.pdb"
SubSystem="1"
- TargetMachine="17"
- FixedBaseAddress="1"
+ OptimizeReferences="2"
+ EnableCOMDATFolding="2"
+ LinkTimeCodeGeneration="1"
+ TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
@@ -188,21 +189,20 @@ />
<Tool
Name="VCPostBuildEventTool"
- CommandLine=""
+ CommandLine="@echo off
echo Compiling Command Modules...
cd ..\src\commands
nmake -f commands.mak
echo Compiling Modules...
cd ..\modules
nmake -f modules.mak
"
/>
</Configuration>
<Configuration
- Name="Release|Win32"
- OutputDirectory="..\bin\release\bin"
- IntermediateDirectory="Release"
+ Name="Debug|x64"
+ OutputDirectory="..\bin\debug_x64\bin"
+ IntermediateDirectory="x64DebugVc80"
ConfigurationType="1"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
CharacterSet="2"
>
<Tool
Name="VCPreBuildEventTool"
- Description="running configure..."
- CommandLine=""$(InputDir)\configure.exe""
+ CommandLine=""
/>
<Tool
Name="VCCustomBuildTool"
@@ -215,19 +215,20 @@ />
<Tool
Name="VCMIDLTool"
+ TargetEnvironment="3"
/>
<Tool
Name="VCCLCompilerTool"
- Optimization="1"
- WholeProgramOptimization="true"
+ Optimization="0"
AdditionalIncludeDirectories=".;../include;../../include;../include/modes;../include/commands;../../include/modes;../../include/commands;../win"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WIN64"
MinimalRebuild="true"
- RuntimeLibrary="2"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="1"
UsePrecompiledHeader="0"
WarningLevel="3"
Detect64BitPortabilityProblems="true"
- DebugInformationFormat="0"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -240,16 +241,16 @@ />
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="dbghelp.lib ws2_32.lib mswsock.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 mswsock.lib"
+ ShowProgress="0"
OutputFile="$(OutDir)/inspircd.exe"
LinkIncremental="1"
- EmbedManagedResourceFile="inspircd.ico"
+ IgnoreDefaultLibraryNames=""
GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(OutDir)/inspircd.pdb"
SubSystem="1"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- LinkTimeCodeGeneration="1"
- TargetMachine="1"
+ TargetMachine="17"
+ FixedBaseAddress="1"
/>
<Tool
Name="VCALinkTool"
@@ -274,7 +275,7 @@ />
<Tool
Name="VCPostBuildEventTool"
- CommandLine="@echo off
echo Compiling Command Modules...
cd ..\src\commands
nmake -f commands.mak
echo Compiling Modules...
cd ..\modules
nmake -f modules.mak
"
+ CommandLine=""
/>
</Configuration>
<Configuration
@@ -4764,6 +4765,10 @@ RelativePath=".\inspircd.ico"
>
</File>
+ <File
+ RelativePath=".\resource.rc"
+ >
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/win/m_spanningtreeVC80.vcproj b/win/m_spanningtreeVC80.vcproj index fde969cba..2367ef4ec 100644 --- a/win/m_spanningtreeVC80.vcproj +++ b/win/m_spanningtreeVC80.vcproj @@ -101,9 +101,9 @@ />
</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"
@@ -122,18 +122,18 @@ />
<Tool
Name="VCMIDLTool"
- TargetEnvironment="3"
/>
<Tool
Name="VCCLCompilerTool"
- Optimization="0"
+ AdditionalOptions="/MP"
+ 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"
/>
@@ -148,15 +148,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"
@@ -181,12 +184,14 @@ />
<Tool
Name="VCPostBuildEventTool"
+ Description="Re-basing shared objects..."
+ CommandLine="@cd $(InputDir)
@$(InputDir)\rebase.bat
"
/>
</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"
@@ -205,17 +210,18 @@ />
<Tool
Name="VCMIDLTool"
+ TargetEnvironment="3"
/>
<Tool
Name="VCCLCompilerTool"
- 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"
/>
@@ -230,18 +236,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"
@@ -266,8 +269,6 @@ />
<Tool
Name="VCPostBuildEventTool"
- Description="Re-basing shared objects..."
- CommandLine="@cd $(InputDir)
@$(InputDir)\rebase.bat
"
/>
</Configuration>
<Configuration
diff --git a/win/resource.rc b/win/resource.rc new file mode 100644 index 000000000..88a7666d6 --- /dev/null +++ b/win/resource.rc @@ -0,0 +1,38 @@ +101 ICON "inspircd.ico"
+
+1 VERSIONINFO
+ FILEVERSION 1,2,0,0
+ PRODUCTVERSION 1,2,0,0
+ FILEFLAGSMASK 0x3fL
+#ifdef _DEBUG
+ FILEFLAGS 0x1L
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS 0x40004L
+ FILETYPE 0x1L
+ FILESUBTYPE 0x0L
+BEGIN
+ BLOCK "StringFileInfo"
+ BEGIN
+ BLOCK "040904b0"
+ BEGIN
+ VALUE "Comments", "InspIRCd 1.2 IRC Daemon\0"
+ VALUE "CompanyName", "InspIRCd Development Team\0"
+ VALUE "FileDescription", "InspIRCd\0"
+ VALUE "FileVersion", "1, 2, 0, 0\0"
+ VALUE "InternalName", "InspIRCd\0"
+ VALUE "LegalCopyright", "Copyright (c) 2008 InspIRCd Development Team\0"
+ VALUE "LegalTrademarks", "\0"
+ VALUE "OriginalFilename", "inspircd.exe\0"
+ VALUE "PrivateBuild", "\0"
+ VALUE "ProductName", "InspIRCd - The Inspire IRC Daemon\0"
+ VALUE "ProductVersion", "1, 2, 0, 0\0"
+ VALUE "SpecialBuild", "\0"
+ END
+ END
+ BLOCK "VarFileInfo"
+ BEGIN
+ VALUE "Translation", 0x809, 1200
+ END
+END
|