Permalink
Browse files

minor modifications to make the projects compile with the new directo…

…ry layout and to use the latest oscpack version.

git-svn-id: https://osctools.svn.sourceforge.net/svnroot/osctools/trunk@3 8d86b230-aa17-0410-9ab0-97cb6adfeffd
  • Loading branch information...
1 parent b51cee0 commit cdb8b95bd72d78365dcac739a77de558cb785b2e remymuller committed Jul 3, 2006
Showing with 44 additions and 38 deletions.
  1. +37 −31 OSCBrowser/oscbrowser.vcproj
  2. +4 −4 OSCBrowser/oscbrowserFrm.cpp
  3. +3 −3 OSCBrowser/oscbrowserFrm.h
@@ -17,7 +17,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="&quot;..\..\wxWidgets-2.6.1\lib\vc_lib\mswd&quot;;&quot;..\..\wxWidgets-2.6.1\include&quot;;..\oscpack\osc\;..\oscpack\ip\;..\oscpack\;..\oscpack\zeroconf"
+ AdditionalIncludeDirectories="&quot;..\wxWidgets-2.6.1\lib\vc_lib\mswd&quot;;&quot;..\wxWidgets-2.6.1\include&quot;;..\oscpack\osc\;..\oscpack\ip\;..\oscpack\;..\zeroconf"
PreprocessorDefinitions="WIN32;__WIN32__;_DEBUG;_WINDOWS;wxUSE_GUI=1;__WXDEBUG__"
RuntimeLibrary="3"
Detect64BitPortabilityProblems="FALSE"
@@ -27,7 +27,7 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="comctl32.lib wsock32.lib wxbase26d.lib wxmsw26d_adv.lib wxmsw26d_core.lib rpcrt4.lib wxjpegd.lib wxpngd.lib wxregexd.lib wxtiffd.lib wxzlibd.lib dnssd.lib winmm.lib ws2_32.lib"
- AdditionalLibraryDirectories="&quot;..\..\wxWidgets-2.6.1\lib\vc_lib&quot;;&quot;..\mDNSResponder-107.5\mDNSWindows\DLL\Release\&quot;"
+ AdditionalLibraryDirectories="&quot;..\wxWidgets-2.6.1\lib\vc_lib&quot;"
GenerateDebugInformation="TRUE"/>
<Tool
Name="VCMIDLTool"/>
@@ -39,7 +39,7 @@
Name="VCPreLinkEventTool"/>
<Tool
Name="VCResourceCompilerTool"
- AdditionalIncludeDirectories="&quot;..\..\wxWidgets-2.6.1\include\&quot;"/>
+ AdditionalIncludeDirectories="&quot;..\wxWidgets-2.6.1\include\&quot;"/>
<Tool
Name="VCWebServiceProxyGeneratorTool"/>
<Tool
@@ -59,7 +59,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="3"
- AdditionalIncludeDirectories="&quot;..\..\wxWidgets-2.6.1\lib\vc_lib\msw&quot;;&quot;..\..\wxWidgets-2.6.1\include&quot;;..\oscpack\ip;..\oscpack\osc;..\oscpack;..\oscpack\zeroconf"
+ AdditionalIncludeDirectories="&quot;..\wxWidgets-2.6.1\lib\vc_lib\msw&quot;;&quot;..\wxWidgets-2.6.1\include&quot;;..\oscpack\ip;..\oscpack\osc;..\oscpack;..\zeroconf"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;wxUSE_GUI=1;__WIN32__"
RuntimeLibrary="2"
Detect64BitPortabilityProblems="FALSE"
@@ -69,7 +69,7 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="comctl32.lib wsock32.lib wxbase26.lib wxmsw26_adv.lib wxmsw26_core.lib rpcrt4.lib wxjpeg.lib wxpng.lib wxregex.lib wxtiff.lib wxzlib.lib dnssd.lib winmm.lib ws2_32.lib"
- AdditionalLibraryDirectories="&quot;..\..\wxWidgets-2.6.1\lib\vc_lib&quot;;&quot;..\mDNSResponder-107.5\mDNSWindows\DLL\Release\&quot;"/>
+ AdditionalLibraryDirectories="&quot;..\wxWidgets-2.6.1\lib\vc_lib&quot;"/>
<Tool
Name="VCMIDLTool"/>
<Tool
@@ -80,7 +80,7 @@
Name="VCPreLinkEventTool"/>
<Tool
Name="VCResourceCompilerTool"
- AdditionalIncludeDirectories="&quot;D:\projects\ircam\wxWidgets-2.6.1\include&quot;"/>
+ AdditionalIncludeDirectories="&quot;..\wxWidgets-2.6.1\include\&quot;"/>
<Tool
Name="VCWebServiceProxyGeneratorTool"/>
<Tool
@@ -281,32 +281,38 @@
RelativePath="..\oscpack\osc\OscTypes.h">
</File>
</Filter>
- <Filter
- Name="zeroconf"
- Filter="">
- <File
- RelativePath="..\oscpack\zeroconf\win32\OscUdpZeroConfBrowser.cpp">
- </File>
- <File
- RelativePath="..\oscpack\zeroconf\OscUdpZeroConfBrowser.h">
- </File>
- <File
- RelativePath="..\oscpack\zeroconf\win32\OscUdpZeroConfResolver.cpp">
- </File>
- <File
- RelativePath="..\oscpack\zeroconf\OscUdpZeroConfResolver.h">
- </File>
- <File
- RelativePath="..\oscpack\zeroconf\win32\OscUdpZeroConfService.cpp">
- </File>
- <File
- RelativePath="..\oscpack\zeroconf\OscUdpZeroConfService.h">
- </File>
- </Filter>
</Filter>
- <File
- RelativePath=".\resource.h">
- </File>
+ <Filter
+ Name="zeroconf"
+ Filter="">
+ <File
+ RelativePath="..\zeroconf\win32\OscUdpZeroConfBrowser.cpp">
+ </File>
+ <File
+ RelativePath="..\zeroconf\OscUdpZeroConfBrowser.h">
+ </File>
+ <File
+ RelativePath="..\zeroconf\win32\OscUdpZeroConfResolver.cpp">
+ </File>
+ <File
+ RelativePath="..\zeroconf\OscUdpZeroConfResolver.h">
+ </File>
+ <File
+ RelativePath="..\zeroconf\win32\OscUdpZeroConfService.cpp">
+ </File>
+ <File
+ RelativePath="..\zeroconf\OscUdpZeroConfService.h">
+ </File>
+ <File
+ RelativePath=".\resource.h">
+ </File>
+ <File
+ RelativePath="..\zeroconf\win32\ZeroConf.cpp">
+ </File>
+ <File
+ RelativePath="..\zeroconf\ZeroConf.h">
+ </File>
+ </Filter>
</Files>
<Globals>
</Globals>
@@ -173,7 +173,7 @@ wxTreeItemId MyFindItem(wxTreeCtrl *tree, const wxTreeItemId& parent,const wxStr
return item;
}
//-----------------------------------------------------------------------------------------
-void oscbrowserFrame::OnResolveService(string fullName,string hostTarget,int port,string txtRecord)
+void oscbrowserFrame::OnResolveService(const char *fullName,const char *hostTarget,int port,const char *txtRecord)
{
wxStringTokenizer tokenizer(fullName,".",wxTOKEN_STRTOK);
@@ -210,7 +210,7 @@ void oscbrowserFrame::OnResolveService(string fullName,string hostTarget,int por
item = AppendItem(tree,item,ipstr+wxT(":")+portstr);
}
//-----------------------------------------------------------------------------------------
-void oscbrowserFrame::OnAddService(string name,string type,string domain)
+void oscbrowserFrame::OnAddService(const char *name,const char *type,const char *domain)
{
wxTreeItemId item = tree->GetRootItem();
@@ -233,10 +233,10 @@ void oscbrowserFrame::OnAddService(string name,string type,string domain)
item = AppendItem(tree,item,name);
tree->SetItemBold(item);
- resolvers[name] = new OscUdpZeroConfResolver(name.c_str(),type.c_str(),domain.c_str(),this);
+ resolvers[name] = new OscUdpZeroConfResolver(name,type,domain,this);
}
//-----------------------------------------------------------------------------------------
-void oscbrowserFrame::OnRemoveService(string name,string type,string domain)
+void oscbrowserFrame::OnRemoveService(const char *name,const char *type,const char *domain)
{
wxTreeItemId rootitem = tree->GetRootItem(); if(!rootitem.IsOk()) return;
@@ -49,11 +49,11 @@ class oscbrowserFrame : public wxFrame
void OnAbout(wxCommandEvent& event);
// OSC Browser
- void OnAddService(string name,string type,string domain);
- void OnRemoveService(string name,string type,string domain);
+ void OnAddService(const char *name,const char *type,const char *domain);
+ void OnRemoveService(const char *name,const char *type,const char *domain);
// OSC Resolver
- void OnResolveService(string fullName,string hostTarget,int port,string txtRecord);
+ void OnResolveService(const char *fullName,const char *hostTarget,int port,const char *txtRecord);
private:
DECLARE_CLASS(oscbrowserFrame)

0 comments on commit cdb8b95

Please sign in to comment.