Merge pull request Sensebloom#16 from AdbC99/master

Bug fixes
Anakele · Jul 22, 2011 · 9d3a92b · 9d3a92b
2 parents 7b61692 + 11aa03e
commit 9d3a92b
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/OSCeleton.sln b/OSCeleton.sln
@@ -6,7 +6,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OSCeleton", "src\OSCeleton.
 		{FB8CF783-12C2-AD48-B0E9-DA7DF5EB719B} = {FB8CF783-12C2-AD48-B0E9-DA7DF5EB719B}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "liblo", "liblo-0.26\build\vs2008\liblo.vcproj", "{FB8CF783-12C2-AD48-B0E9-DA7DF5EB719B}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "liblo", "liblo-0.26-modified\build\vs2008\liblo.vcproj", "{FB8CF783-12C2-AD48-B0E9-DA7DF5EB719B}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

diff --git a/liblo-0.26-modified/lo/lo.h b/liblo-0.26-modified/lo/lo.h
@@ -30,6 +30,9 @@ extern "C" {
 #include "lo/lo_osc_types.h"
 #include "lo/lo_errors.h"
 #include "lo/lo_lowlevel.h"
+
+/* Modify header to expose send_data for file2osc to work */
+int send_data(lo_address a, lo_server from, char *data, const size_t data_len);
 
 /**
  * \defgroup liblo High-level OSC API

diff --git a/liblo-0.26-modified/src/send.c b/liblo-0.26-modified/src/send.c
@@ -59,7 +59,6 @@ int initWSock();
 
 static int resolve_address(lo_address a);
 static int create_socket(lo_address a);
-static int send_data(lo_address a, lo_server from, char *data, const size_t data_len);
 
 // message.c
 int lo_message_add_varargs_internal(lo_message m, const char *types, va_list ap,
@@ -370,7 +369,7 @@ static int create_socket(lo_address a)
     return 0;
 }
 
-static int send_data(lo_address a, lo_server from, char *data, const size_t data_len)
+int send_data(lo_address a, lo_server from, char *data, const size_t data_len)
 {
     int ret=0;
     int sock=-1;

diff --git a/src/OSCeleton.vcproj b/src/OSCeleton.vcproj
@@ -41,7 +41,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="&quot;..\liblo-0.26&quot;;&quot;$(OPEN_NI_INCLUDE)&quot;;&quot;../Pre-built.2/include&quot;"
+				AdditionalIncludeDirectories="&quot;..\liblo-0.26-modified&quot;;&quot;$(OPEN_NI_INCLUDE)&quot;;&quot;../Pre-built.2/include&quot;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -63,7 +63,7 @@
 				Name="VCLinkerTool"
 				AdditionalDependencies="OpenNI.lib WS2_32.Lib winmm.lib liblo_d.lib"
 				LinkIncremental="2"
-				AdditionalLibraryDirectories="lib;&quot;$(OPEN_NI_LIB)&quot;;&quot;../liblo-0.26/lib/DebugLib&quot;"
+				AdditionalLibraryDirectories="lib;&quot;$(OPEN_NI_LIB)&quot;;&quot;../liblo-0.26-modified/lib/DebugLib&quot;"
 				GenerateDebugInformation="true"
 				SubSystem="1"
 				TargetMachine="1"
@@ -118,7 +118,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="&quot;..\liblo-0.26&quot;;&quot;$(OPEN_NI_INCLUDE)&quot;;&quot;../Pre-built.2/include&quot;"
+				AdditionalIncludeDirectories="&quot;..\liblo-0.26-modified&quot;;&quot;$(OPEN_NI_INCLUDE)&quot;;&quot;../Pre-built.2/include&quot;"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
@@ -140,7 +140,7 @@
 				Name="VCLinkerTool"
 				AdditionalDependencies="OpenNI.lib WS2_32.Lib winmm.lib glut32.lib liblo.lib"
 				LinkIncremental="1"
-				AdditionalLibraryDirectories="lib;&quot;$(OPEN_NI_LIB)&quot;;&quot;../liblo-0.26/lib/ReleaseLib&quot;"
+				AdditionalLibraryDirectories="lib;&quot;$(OPEN_NI_LIB)&quot;;&quot;../liblo-0.26-modified/lib/ReleaseLib&quot;"
 				GenerateDebugInformation="true"
 				SubSystem="1"
 				OptimizeReferences="2"