diff --git a/network_core.h b/network_core.h index 3130ce2e3e..4114f5e418 100644 --- a/network_core.h +++ b/network_core.h @@ -13,11 +13,7 @@ #include #include -#ifdef _MSC_VER - #pragma comment (lib, "ws2_32.lib") -#endif //_MSC_VER - -#if ! (defined(__MINGW32__) || defined(__CYGWIN__)) +#if !(defined(__MINGW32__) || defined(__CYGWIN__)) // Windows has some different names for some types.. typedef SSIZE_T ssize_t; typedef int socklen_t; diff --git a/ttd.dsp b/ttd.dsp index aba42ca833..5af29d729f 100644 --- a/ttd.dsp +++ b/ttd.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Console Application" 0x0103 -CFG=ttd - Win32 Checked +CFG=ttd - Win32 Debug !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run !MESSAGE @@ -19,8 +19,6 @@ CFG=ttd - Win32 Checked !MESSAGE !MESSAGE "ttd - Win32 Release" (based on "Win32 (x86) Console Application") !MESSAGE "ttd - Win32 Debug" (based on "Win32 (x86) Console Application") -!MESSAGE "ttd - Win32 Checked" (based on "Win32 (x86) Console Application") -!MESSAGE "ttd - Win32 Release with PNG" (based on "Win32 (x86) Console Application") !MESSAGE # Begin Project @@ -44,7 +42,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Yu"stdafx.h" /FD /c -# ADD CPP /nologo /Gd /Zp4 /W3 /Zi /Ox /Oa /Ow /Og /Oi /Os /Gf /Gy /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "WIN32_EXCEPTION_TRACKER" /D "WIN32_ENABLE_DIRECTMUSIC_SUPPORT" /FAcs /FR /Yu"stdafx.h" /J /FD /c +# ADD CPP /nologo /Gd /Zp4 /W3 /Zi /Ox /Oa /Ow /Og /Oi /Os /Gf /Gy /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "WIN32_EXCEPTION_TRACKER" /D "WIN32_ENABLE_DIRECTMUSIC_SUPPORT" /D "WITH_PNG" /D "WITH_ZLIB" /D "ENABLE_NETWORK" /FAcs /FR /Yu"stdafx.h" /J /FD /c # SUBTRACT CPP /WX /Ot # ADD BASE RSC /l 0x809 /d "NDEBUG" # ADD RSC /l 0x809 /d "NDEBUG" @@ -53,7 +51,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winmm.lib /nologo /subsystem:windows /map /machine:I386 /opt:nowin98 +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winmm.lib ws2_32.lib libpng.lib zlibstat.lib /nologo /subsystem:windows /map /machine:I386 /opt:nowin98 # SUBTRACT LINK32 /pdb:none !ELSEIF "$(CFG)" == "ttd - Win32 Debug" @@ -70,7 +68,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Yu"stdafx.h" /FD /GZ /c -# ADD CPP /nologo /MTd /W3 /Gm /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "WITH_SDL" /D "WIN32_ENABLE_DIRECTMUSIC_SUPPORT" /D "WITH_PNG" /D "WITH_ZLIB" /D "ENABLE_NETWORK" /YX"stdafx.h" /FD /GZ /c +# ADD CPP /nologo /MTd /W3 /Gm /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "WITH_PNG" /D "WITH_ZLIB" /D "ENABLE_NETWORK" /YX"stdafx.h" /FD /GZ /c # SUBTRACT CPP /WX /Fr # ADD BASE RSC /l 0x809 /d "_DEBUG" # ADD RSC /l 0x809 /d "_DEBUG" @@ -82,71 +80,12 @@ LINK32=link.exe # ADD LINK32 kernel32.lib user32.lib gdi32.lib winmm.lib ws2_32.lib libpng.lib zlibstat.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept # SUBTRACT LINK32 /pdb:none -!ELSEIF "$(CFG)" == "ttd - Win32 Checked" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "ttd___Win32_Checked" -# PROP BASE Intermediate_Dir "ttd___Win32_Checked" -# PROP BASE Ignore_Export_Lib 0 -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Checked" -# PROP Intermediate_Dir "Checked" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /MTd /W3 /Gm /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "WITH_SDL" /D "WIN32_ENABLE_DIRECTMUSIC_SUPPORT" /YX"stdafx.h" /FD /GZ /c -# SUBTRACT BASE CPP /WX /Fr -# ADD CPP /nologo /Gd /Zp4 /ML /W3 /Gm /Zi /Ox /Oa /Ow /Og /Oi /Os /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "WITH_SDL" /D "WIN32_ENABLE_DIRECTMUSIC_SUPPORT" /YX"stdafx.h" /FD /c -# ADD BASE RSC /l 0x809 /d "_DEBUG" -# ADD RSC /l 0x809 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winmm.lib ws2_32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept -# SUBTRACT BASE LINK32 /pdb:none -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winmm.lib ws2_32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept -# SUBTRACT LINK32 /pdb:none /incremental:no - -!ELSEIF "$(CFG)" == "ttd - Win32 Release with PNG" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "ttd___Win32_Release_with_PNG" -# PROP BASE Intermediate_Dir "ttd___Win32_Release_with_PNG" -# PROP BASE Ignore_Export_Lib 0 -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "ReleasePNG" -# PROP Intermediate_Dir "ReleasePNG" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /Gd /Zp4 /W3 /Zi /Ox /Oa /Ow /Og /Oi /Os /Gf /Gy /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "WIN32_EXCEPTION_TRACKER" /D "WIN32_ENABLE_DIRECTMUSIC_SUPPORT" /FAcs /FR /Yu"stdafx.h" /J /FD /c -# SUBTRACT BASE CPP /WX /Ot -# ADD CPP /nologo /Gd /Zp4 /W3 /Zi /Ox /Oa /Ow /Og /Oi /Os /Gf /Gy /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "WIN32_EXCEPTION_TRACKER" /D "WIN32_ENABLE_DIRECTMUSIC_SUPPORT" /D "WITH_PNG" /D "WITH_ZLIB" /D "ENABLE_NETWORK" /FAcs /FR /Yu"stdafx.h" /J /FD /c -# SUBTRACT CPP /WX /Ot -# ADD BASE RSC /l 0x809 /d "NDEBUG" -# ADD RSC /l 0x809 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winmm.lib libpng.lib zlibstat.lib /nologo /subsystem:windows /map /machine:I386 /opt:nowin98 -# SUBTRACT BASE LINK32 /pdb:none -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winmm.lib libpng.lib zlibstat.lib /nologo /subsystem:windows /map /machine:I386 /opt:nowin98 -# SUBTRACT LINK32 /pdb:none - !ENDIF # Begin Target # Name "ttd - Win32 Release" # Name "ttd - Win32 Debug" -# Name "ttd - Win32 Checked" -# Name "ttd - Win32 Release with PNG" # Begin Group "Source Files" # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" @@ -242,16 +181,6 @@ SOURCE=.\minilzo.c # SUBTRACT CPP /YX -!ELSEIF "$(CFG)" == "ttd - Win32 Checked" - -# SUBTRACT BASE CPP /YX -# SUBTRACT CPP /YX - -!ELSEIF "$(CFG)" == "ttd - Win32 Release with PNG" - -# SUBTRACT BASE CPP /YX /Yc /Yu -# SUBTRACT CPP /YX /Yc /Yu - !ENDIF # End Source File @@ -342,13 +271,6 @@ SOURCE=.\StdAfx.c !ELSEIF "$(CFG)" == "ttd - Win32 Debug" -!ELSEIF "$(CFG)" == "ttd - Win32 Checked" - -!ELSEIF "$(CFG)" == "ttd - Win32 Release with PNG" - -# ADD BASE CPP /Yc"stdafx.h" -# ADD CPP /Yc"stdafx.h" - !ENDIF # End Source File @@ -389,16 +311,6 @@ SOURCE=.\unix.c # PROP Exclude_From_Build 1 -!ELSEIF "$(CFG)" == "ttd - Win32 Checked" - -# PROP BASE Exclude_From_Build 1 -# PROP Exclude_From_Build 1 - -!ELSEIF "$(CFG)" == "ttd - Win32 Release with PNG" - -# PROP BASE Exclude_From_Build 1 -# PROP Exclude_From_Build 1 - !ENDIF # End Source File @@ -429,13 +341,6 @@ SOURCE=.\w32dm2.cpp !ELSEIF "$(CFG)" == "ttd - Win32 Debug" -!ELSEIF "$(CFG)" == "ttd - Win32 Checked" - -!ELSEIF "$(CFG)" == "ttd - Win32 Release with PNG" - -# SUBTRACT BASE CPP /YX /Yc /Yu -# SUBTRACT CPP /YX /Yc /Yu - !ENDIF # End Source File diff --git a/ttd.sln b/ttd.sln index 0f7b379cf6..36703dd8c6 100644 --- a/ttd.sln +++ b/ttd.sln @@ -15,29 +15,19 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "langs", "langs.vcproj", "{0 EndProjectSection EndProject Global - GlobalSection(DPCodeReviewSolutionGUID) = preSolution - DPCodeReviewSolutionGUID = {00000000-0000-0000-0000-000000000000} - EndGlobalSection GlobalSection(SolutionConfiguration) = preSolution - Checked = Checked Debug = Debug Release = Release EndGlobalSection GlobalSection(ProjectConfiguration) = postSolution - {A133A442-BD0A-4ADE-B117-AD7545E4BDD1}.Checked.ActiveCfg = Debug|Win32 - {A133A442-BD0A-4ADE-B117-AD7545E4BDD1}.Checked.Build.0 = Debug|Win32 {A133A442-BD0A-4ADE-B117-AD7545E4BDD1}.Debug.ActiveCfg = Debug|Win32 {A133A442-BD0A-4ADE-B117-AD7545E4BDD1}.Debug.Build.0 = Debug|Win32 {A133A442-BD0A-4ADE-B117-AD7545E4BDD1}.Release.ActiveCfg = Debug|Win32 {A133A442-BD0A-4ADE-B117-AD7545E4BDD1}.Release.Build.0 = Debug|Win32 - {668328A0-B40E-4CDB-BD72-D0064424414A}.Checked.ActiveCfg = Checked|Win32 - {668328A0-B40E-4CDB-BD72-D0064424414A}.Checked.Build.0 = Checked|Win32 {668328A0-B40E-4CDB-BD72-D0064424414A}.Debug.ActiveCfg = Debug|Win32 {668328A0-B40E-4CDB-BD72-D0064424414A}.Debug.Build.0 = Debug|Win32 {668328A0-B40E-4CDB-BD72-D0064424414A}.Release.ActiveCfg = Release|Win32 {668328A0-B40E-4CDB-BD72-D0064424414A}.Release.Build.0 = Release|Win32 - {0F066B23-18DF-4284-8265-F4A5E7E3B966}.Checked.ActiveCfg = Debug|Win32 - {0F066B23-18DF-4284-8265-F4A5E7E3B966}.Checked.Build.0 = Debug|Win32 {0F066B23-18DF-4284-8265-F4A5E7E3B966}.Debug.ActiveCfg = Debug|Win32 {0F066B23-18DF-4284-8265-F4A5E7E3B966}.Debug.Build.0 = Debug|Win32 {0F066B23-18DF-4284-8265-F4A5E7E3B966}.Release.ActiveCfg = Debug|Win32 @@ -47,4 +37,7 @@ Global EndGlobalSection GlobalSection(ExtensibilityAddIns) = postSolution EndGlobalSection + GlobalSection(DPCodeReviewSolutionGUID) = preSolution + DPCodeReviewSolutionGUID = {00000000-0000-0000-0000-000000000000} + EndGlobalSection EndGlobal diff --git a/ttd.vcproj b/ttd.vcproj index f19d971ce2..30ba747828 100644 --- a/ttd.vcproj +++ b/ttd.vcproj @@ -53,7 +53,7 @@ Name="VCCustomBuildTool"/> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1002,15 +717,6 @@ PreprocessorDefinitions="" BrowseInformation="1"/> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -