Author: titmuss
Date: Thu Feb 28 03:18:02 2008
New Revision: 2067
URL: http://svn.slimdevices.com?rev=2067&root=Jive&view=rev
Log:
Bug: 6975
Description:
Fixing windows build after renaming.
Modified:
trunk/squeezeplay/src/Jive.sln
trunk/squeezeplay/src/squeezeplay/VisualC/PostBuild.bat
trunk/squeezeplay/src/squeezeplay/VisualC/jive.vcproj
trunk/squeezeplay/src/squeezeplay/src/net/jive_dns.c
Modified: trunk/squeezeplay/src/Jive.sln
URL:
http://svn.slimdevices.com/trunk/squeezeplay/src/Jive.sln?rev=2067&root=Jive&r1=2066&r2=2067&view=diff
==============================================================================
--- trunk/squeezeplay/src/Jive.sln (original)
+++ trunk/squeezeplay/src/Jive.sln Thu Feb 28 03:18:02 2008
@@ -1,4 +1,3 @@
-
Microsoft Visual Studio Solution File, Format Version 9.00
# Visual Studio 2005
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL",
"SDL-1.2.11\VisualC\SDL\SDL.vcproj", "{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}"
@@ -47,20 +46,20 @@
{432D23FC-5507-446F-AA7A-689166AA92EF} =
{432D23FC-5507-446F-AA7A-689166AA92EF}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jive",
"jive\VisualC\jive.vcproj", "{5E241B78-0AD3-4CAA-9985-EA4C32B4394A}"
- ProjectSection(ProjectDependencies) = postProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "squeezeplay",
"squeezeplay\VisualC\jive.vcproj", "{5E241B78-0AD3-4CAA-9985-EA4C32B4394A}"
+ ProjectSection(ProjectDependencies) = postProject
+ {8B52C509-C13F-4E3F-9744-FF110B2746E1} =
{8B52C509-C13F-4E3F-9744-FF110B2746E1}
{DDA7F013-8909-4150-98CB-07D002978679} =
{DDA7F013-8909-4150-98CB-07D002978679}
+ {66E3CE14-884D-4AEA-9F20-15A0BEAF8C5A} =
{66E3CE14-884D-4AEA-9F20-15A0BEAF8C5A}
+ {21C196A0-FA8B-4494-9F30-AF5C2EAD369F} =
{21C196A0-FA8B-4494-9F30-AF5C2EAD369F}
+ {18DC63A2-81C0-4E3C-B3DD-F6EDB7B084A8} =
{18DC63A2-81C0-4E3C-B3DD-F6EDB7B084A8}
+ {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68} =
{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}
+ {128E8BD0-174A-48F0-8771-92B1E8D18713} =
{128E8BD0-174A-48F0-8771-92B1E8D18713}
+ {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A} =
{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}
{AA7BA9D8-4727-47EC-A9E7-6774A58F6EB5} =
{AA7BA9D8-4727-47EC-A9E7-6774A58F6EB5}
- {8B52C509-C13F-4E3F-9744-FF110B2746E1} =
{8B52C509-C13F-4E3F-9744-FF110B2746E1}
- {432D23FC-5507-446F-AA7A-689166AA92EF} =
{432D23FC-5507-446F-AA7A-689166AA92EF}
+ {DBDDC3DC-BDC1-4F25-8323-366DDBED734C} =
{DBDDC3DC-BDC1-4F25-8323-366DDBED734C}
{F80450F2-8B32-4F92-A6E6-BADF07C0359B} =
{F80450F2-8B32-4F92-A6E6-BADF07C0359B}
- {DBDDC3DC-BDC1-4F25-8323-366DDBED734C} =
{DBDDC3DC-BDC1-4F25-8323-366DDBED734C}
- {DA956FD3-E142-46F2-9DD5-C78BEBB56B7A} =
{DA956FD3-E142-46F2-9DD5-C78BEBB56B7A}
- {128E8BD0-174A-48F0-8771-92B1E8D18713} =
{128E8BD0-174A-48F0-8771-92B1E8D18713}
- {81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68} =
{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}
- {18DC63A2-81C0-4E3C-B3DD-F6EDB7B084A8} =
{18DC63A2-81C0-4E3C-B3DD-F6EDB7B084A8}
- {21C196A0-FA8B-4494-9F30-AF5C2EAD369F} =
{21C196A0-FA8B-4494-9F30-AF5C2EAD369F}
- {66E3CE14-884D-4AEA-9F20-15A0BEAF8C5A} =
{66E3CE14-884D-4AEA-9F20-15A0BEAF8C5A}
+ {432D23FC-5507-446F-AA7A-689166AA92EF} =
{432D23FC-5507-446F-AA7A-689166AA92EF}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "luaprofiler",
"luaprofiler-2.0\VisualC\luaprofiler.vcproj",
"{AA7BA9D8-4727-47EC-A9E7-6774A58F6EB5}"
Modified: trunk/squeezeplay/src/squeezeplay/VisualC/PostBuild.bat
URL:
http://svn.slimdevices.com/trunk/squeezeplay/src/squeezeplay/VisualC/PostBuild.bat?rev=2067&root=Jive&r1=2066&r2=2067&view=diff
==============================================================================
--- trunk/squeezeplay/src/squeezeplay/VisualC/PostBuild.bat (original)
+++ trunk/squeezeplay/src/squeezeplay/VisualC/PostBuild.bat Thu Feb 28 03:18:02
2008
@@ -8,11 +8,11 @@
md %1\lua
md %1\lua\applets
-xcopy jive\share\applets\*.* %1\lua\applets\*.* /S/Y
-xcopy jive_desktop\share\applets\*.* %1\lua\applets\*.* /S/Y
+xcopy squeezeplay\share\applets\*.* %1\lua\applets\*.* /S/Y
+xcopy squeezeplay_desktop\share\applets\*.* %1\lua\applets\*.* /S/Y
md %1\lua\jive
-xcopy jive\share\jive\*.* %1\lua\jive\*.* /S/Y
+xcopy squeezeplay\share\jive\*.* %1\lua\jive\*.* /S/Y
md %1\lua\loop
xcopy loop-2.2-alpha\loop\*.* %1\lua\loop\*.* /S/Y
Modified: trunk/squeezeplay/src/squeezeplay/VisualC/jive.vcproj
URL:
http://svn.slimdevices.com/trunk/squeezeplay/src/squeezeplay/VisualC/jive.vcproj?rev=2067&root=Jive&r1=2066&r2=2067&view=diff
==============================================================================
--- trunk/squeezeplay/src/squeezeplay/VisualC/jive.vcproj (original)
+++ trunk/squeezeplay/src/squeezeplay/VisualC/jive.vcproj Thu Feb 28 03:18:02
2008
@@ -2,9 +2,9 @@
<VisualStudioProject
ProjectType="Visual C++"
Version="8.00"
- Name="jive"
+ Name="squeezeplay"
ProjectGUID="{5E241B78-0AD3-4CAA-9985-EA4C32B4394A}"
- RootNamespace="jive"
+ RootNamespace="squeezeplay"
Keyword="Win32Proj"
>
<Platforms>
@@ -62,6 +62,7 @@
/>
<Tool
Name="VCLinkerTool"
+ AdditionalDependencies="ws2_32.lib"
LinkIncremental="2"
AdditionalLibraryDirectories=""
GenerateDebugInformation="true"
Modified: trunk/squeezeplay/src/squeezeplay/src/net/jive_dns.c
URL:
http://svn.slimdevices.com/trunk/squeezeplay/src/squeezeplay/src/net/jive_dns.c?rev=2067&root=Jive&r1=2066&r2=2067&view=diff
==============================================================================
--- trunk/squeezeplay/src/squeezeplay/src/net/jive_dns.c (original)
+++ trunk/squeezeplay/src/squeezeplay/src/net/jive_dns.c Thu Feb 28 03:18:02
2008
@@ -190,6 +190,7 @@
struct dns_userdata *u;
int r;
+#ifndef _WIN32
u = lua_newuserdata(L, sizeof(struct dns_userdata));
r = socketpair(AF_UNIX, SOCK_STREAM, 0, u->fd);
@@ -203,6 +204,9 @@
lua_setmetatable(L, -2);
return 1;
+#else
+ return 0;
+#endif // _WIN32
}
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
