Skip to content

Commit

Permalink
Updated Visual Studio project
Browse files Browse the repository at this point in the history
  • Loading branch information
@slouken
slouken committed Jun 7, 2013
1 parent 55493e6 commit 256ef66
Show file tree
Hide file tree
Showing 5 changed files with 51 additions and 45 deletions.
3 changes: 3 additions & 0 deletions CHANGES.txt
View file
@@ -1,3 +1,6 @@
Sam Lantinga - Sat Jun 1 19:11:26 PDT 2013
* Updated for SDL 2.0 release

1.2.9:
Simeon Maxein - Mon Jul 2 08:02:57 EDT 2012
* Made it possible to use SDL_net without SDL
Expand Down
51 changes: 24 additions & 27 deletions VisualC/SDL_net_VS2008.vcproj
View file
Expand Up @@ -20,8 +20,8 @@
<Configurations>
<Configuration
Name="Debug|Win32"
OutputDirectory=".\Debug"
IntermediateDirectory=".\Debug"
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
UseOfMFC="0"
Expand All @@ -45,7 +45,7 @@
MkTypLibCompatible="true"
SuppressStartupBanner="true"
TargetEnvironment="1"
TypeLibraryName=".\Debug/SDL_net.tlb"
TypeLibraryName=".\Debug/SDL2_net.tlb"
HeaderFileName=""
/>
<Tool
Expand All @@ -54,7 +54,7 @@
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
MinimalRebuild="true"
RuntimeLibrary="2"
PrecompiledHeaderFile=".\Debug/SDL_net.pch"
PrecompiledHeaderFile=".\Debug/SDL2_net.pch"
WarningLevel="3"
SuppressStartupBanner="true"
DebugInformationFormat="4"
Expand All @@ -76,7 +76,7 @@
LinkIncremental="2"
SuppressStartupBanner="true"
GenerateDebugInformation="true"
ProgramDatabaseFile=".\Debug/SDL_net.pdb"
ProgramDatabaseFile=".\Debug/SDL2_net.pdb"
SubSystem="2"
TargetMachine="1"
/>
Expand All @@ -92,7 +92,7 @@
<Tool
Name="VCBscMakeTool"
SuppressStartupBanner="true"
OutputFile=".\Debug/SDL_net.bsc"
OutputFile=".\Debug/SDL2_net.bsc"
/>
<Tool
Name="VCFxCopTool"
Expand All @@ -106,7 +106,7 @@
</Configuration>
<Configuration
Name="Debug|x64"
OutputDirectory="$(PlatformName)\$(ConfigurationName)"
OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
Expand All @@ -131,7 +131,7 @@
MkTypLibCompatible="true"
SuppressStartupBanner="true"
TargetEnvironment="3"
TypeLibraryName=".\Debug/SDL_net.tlb"
TypeLibraryName=".\Debug/SDL2_net.tlb"
HeaderFileName=""
/>
<Tool
Expand All @@ -140,7 +140,7 @@
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
MinimalRebuild="true"
RuntimeLibrary="2"
PrecompiledHeaderFile=".\Debug/SDL_net.pch"
PrecompiledHeaderFile=".\Debug/SDL2_net.pch"
AssemblerListingLocation=".\Debug/"
ObjectFile=".\Debug/"
ProgramDataBaseFileName=".\Debug/"
Expand All @@ -161,12 +161,11 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="ws2_32.lib iphlpapi.lib SDL.lib"
OutputFile=".\Debug/SDL_net.dll"
AdditionalDependencies="ws2_32.lib iphlpapi.lib SDL2.lib"
LinkIncremental="2"
SuppressStartupBanner="true"
GenerateDebugInformation="true"
ProgramDatabaseFile=".\Debug/SDL_net.pdb"
ProgramDatabaseFile=".\Debug/SDL2_net.pdb"
SubSystem="2"
TargetMachine="17"
/>
Expand All @@ -182,7 +181,7 @@
<Tool
Name="VCBscMakeTool"
SuppressStartupBanner="true"
OutputFile=".\Debug/SDL_net.bsc"
OutputFile=".\Debug/SDL2_net.bsc"
/>
<Tool
Name="VCFxCopTool"
Expand All @@ -196,8 +195,8 @@
</Configuration>
<Configuration
Name="Release|Win32"
OutputDirectory=".\Release"
IntermediateDirectory=".\Release"
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
UseOfMFC="0"
Expand All @@ -221,7 +220,7 @@
MkTypLibCompatible="true"
SuppressStartupBanner="true"
TargetEnvironment="1"
TypeLibraryName=".\Release/SDL_net.tlb"
TypeLibraryName=".\Release/SDL2_net.tlb"
HeaderFileName=""
/>
<Tool
Expand All @@ -232,7 +231,7 @@
StringPooling="true"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
PrecompiledHeaderFile=".\Release/SDL_net.pch"
PrecompiledHeaderFile=".\Release/SDL2_net.pch"
WarningLevel="3"
SuppressStartupBanner="true"
/>
Expand All @@ -250,10 +249,9 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="wsock32.lib iphlpapi.lib SDL2.lib"
OutputFile="$(OutDir)\$(ProjectName).dll"
LinkIncremental="1"
SuppressStartupBanner="true"
ProgramDatabaseFile=".\Release/SDL_net.pdb"
ProgramDatabaseFile=".\Release/SDL2_net.pdb"
SubSystem="2"
TargetMachine="1"
/>
Expand All @@ -269,7 +267,7 @@
<Tool
Name="VCBscMakeTool"
SuppressStartupBanner="true"
OutputFile=".\Release/SDL_net.bsc"
OutputFile=".\Release/SDL2_net.bsc"
/>
<Tool
Name="VCFxCopTool"
Expand All @@ -283,7 +281,7 @@
</Configuration>
<Configuration
Name="Release|x64"
OutputDirectory="$(PlatformName)\$(ConfigurationName)"
OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
Expand All @@ -308,7 +306,7 @@
MkTypLibCompatible="true"
SuppressStartupBanner="true"
TargetEnvironment="3"
TypeLibraryName=".\Release/SDL_net.tlb"
TypeLibraryName=".\Release/SDL2_net.tlb"
HeaderFileName=""
/>
<Tool
Expand All @@ -319,7 +317,7 @@
StringPooling="true"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
PrecompiledHeaderFile=".\Release/SDL_net.pch"
PrecompiledHeaderFile=".\Release/SDL2_net.pch"
WarningLevel="3"
SuppressStartupBanner="true"
/>
Expand All @@ -336,11 +334,10 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="ws2_32.lib iphlpapi.lib SDL.lib"
OutputFile=".\Release/SDL_net.dll"
AdditionalDependencies="ws2_32.lib iphlpapi.lib SDL2.lib"
LinkIncremental="1"
SuppressStartupBanner="true"
ProgramDatabaseFile=".\Release/SDL_net.pdb"
ProgramDatabaseFile=".\Release/SDL2_net.pdb"
SubSystem="2"
TargetMachine="17"
/>
Expand All @@ -356,7 +353,7 @@
<Tool
Name="VCBscMakeTool"
SuppressStartupBanner="true"
OutputFile=".\Release/SDL_net.bsc"
OutputFile=".\Release/SDL2_net.bsc"
/>
<Tool
Name="VCFxCopTool"
Expand Down
6 changes: 6 additions & 0 deletions VisualC/clean.sh
View file
@@ -0,0 +1,6 @@
find . -depth -type d -name 'x64' -exec rm -rv {} \;
find . -depth -type d -name 'Debug' -exec rm -rv {} \;
find . -depth -type d -name 'Release' -exec rm -rv {} \;
find . -type f -name '*.user' -exec rm -v {} \;
find . -type f -name '*.ncb' -exec rm -v {} \;
find . -type f -name '*.suo' -exec rm -v {} \;
32 changes: 16 additions & 16 deletions VisualC/showinterfaces/showinterfaces.vcproj
View file
Expand Up @@ -20,8 +20,8 @@
<Configurations>
<Configuration
Name="Release|Win32"
OutputDirectory=".\Release"
IntermediateDirectory=".\Release"
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="1"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
UseOfMFC="0"
Expand Down Expand Up @@ -100,13 +100,13 @@
/>
<Tool
Name="VCPostBuildEventTool"
Description="Copy SDL_net"
CommandLine="copy &quot;$(SolutionDir)\$(ConfigurationName)\SDL_net.dll&quot; &quot;$(TargetDir)\SDL_net.dll&quot;"
Description=""
CommandLine=""
/>
</Configuration>
<Configuration
Name="Release|x64"
OutputDirectory="$(PlatformName)\$(ConfigurationName)"
OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="1"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
Expand Down Expand Up @@ -159,7 +159,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="SDL.lib SDLmain.lib"
AdditionalDependencies="SDL2.lib SDL2main.lib"
ProgramDatabaseFile=".\Release/showinterfaces.pdb"
SubSystem="2"
TargetMachine="17"
Expand All @@ -186,14 +186,14 @@
/>
<Tool
Name="VCPostBuildEventTool"
Description="Copy SDL_net"
CommandLine="copy &quot;$(SolutionDir)\$(ConfigurationName)\SDL_net.dll&quot; &quot;$(TargetDir)\SDL_net.dll&quot;"
Description=""
CommandLine=""
/>
</Configuration>
<Configuration
Name="Debug|Win32"
OutputDirectory=".\Debug"
IntermediateDirectory=".\Debug"
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="1"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
UseOfMFC="0"
Expand Down Expand Up @@ -272,13 +272,13 @@
/>
<Tool
Name="VCPostBuildEventTool"
Description="Copy SDL_net"
CommandLine="copy &quot;$(SolutionDir)\$(ConfigurationName)\SDL_net.dll&quot; &quot;$(TargetDir)\SDL_net.dll&quot;"
Description=""
CommandLine=""
/>
</Configuration>
<Configuration
Name="Debug|x64"
OutputDirectory="$(PlatformName)\$(ConfigurationName)"
OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="1"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
Expand Down Expand Up @@ -330,7 +330,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="SDL.lib SDLmain.lib"
AdditionalDependencies="SDL2.lib SDL2main.lib"
GenerateDebugInformation="true"
ProgramDatabaseFile=".\Debug/showinterfaces.pdb"
SubSystem="2"
Expand Down Expand Up @@ -358,8 +358,8 @@
/>
<Tool
Name="VCPostBuildEventTool"
Description="Copy SDL_net"
CommandLine="copy &quot;$(SolutionDir)\$(ConfigurationName)\SDL_net.dll&quot; &quot;$(TargetDir)\SDL_net.dll&quot;"
Description=""
CommandLine=""
/>
</Configuration>
</Configurations>
Expand Down
4 changes: 2 additions & 2 deletions showinterfaces.c
View file
Expand Up @@ -28,9 +28,9 @@ int main(int argc, char *argv[])
int i, count;

count = SDLNet_GetLocalAddresses(addresses, MAX_ADDRESSES);
printf("Found %d local addresses\n", count);
SDL_Log("Found %d local addresses", count);
for ( i = 0; i < count; ++i ) {
printf("%d: %d.%d.%d.%d - %s\n", i+1,
SDL_Log("%d: %d.%d.%d.%d - %s", i+1,
(addresses[i].host >> 0) & 0xFF,
(addresses[i].host >> 8) & 0xFF,
(addresses[i].host >> 16) & 0xFF,
Expand Down

0 comments on commit 256ef66

Please sign in to comment.