Permalink
Browse files

Merged rfs_server/mux VS2010 compilation patch from Peter Edwards

  • Loading branch information...
2 parents abefe29 + 2f529e0 commit d717fc44dbecffac49abc2f7c5810c2d76f911ec @sweetlilmre sweetlilmre committed with bogdanm May 7, 2011
View
@@ -11,4 +11,6 @@ inc/romfiles.h
.sconf_temp/
.sconsign.dblite
config.log
+mux
+rfs_server
View
@@ -6,7 +6,7 @@ builder:init( args )
builder:set_build_mode( builder.BUILD_DIR_LINEARIZED )
local flist = "main.c"
-local rfs_flist = "main.c server.c log.c deskutils.c"
+local rfs_flist = "main.c server.c log.c deskutils.c rfs_transports.c"
local cdefs = "RFS_UDP_TRANSPORT RFS_INSIDE_MUX_MODE"
local socklib
if utils.is_windows() then
View
2 mux.py
@@ -1,7 +1,7 @@
import os, sys, platform
flist = "main.c"
-rfs_flist = "main.c server.c log.c deskutils.c"
+rfs_flist = "main.c server.c log.c deskutils.c rfs_transports.c"
cdefs = "-DRFS_UDP_TRANSPORT -DRFS_INSIDE_MUX_MODE"
socklib = ''
ptlib = ''
View
@@ -145,7 +145,12 @@ static int parse_transport( const char* s )
#define FIRST_SERVICE_IDX 3
#define MIN_ARGC_COUNT 4
+#ifdef _MSC_VER
+#define strcasecmp _stricmp
+int main( int argc, char *argv[] )
+#else
int main( int argc, char **argv )
+#endif
{
unsigned i;
SERVICE_DATA *tservice;
View
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug|Win32">
+ <Configuration>Debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="..\rfs_server_src\deskutils.h" />
+ <ClInclude Include="..\rfs_server_src\log.h" />
+ <ClInclude Include="..\rfs_server_src\net.h" />
+ <ClInclude Include="..\rfs_server_src\rfs.h" />
+ <ClInclude Include="..\rfs_server_src\rfs_transports.h" />
+ <ClInclude Include="..\rfs_server_src\serial.h" />
+ <ClInclude Include="..\rfs_server_src\server.h" />
+ <ClInclude Include="config.h" />
+ </ItemGroup>
+ <ItemGroup>
+ <ClCompile Include="..\rfs_server_src\deskutils.c" />
+ <ClCompile Include="..\rfs_server_src\log.c" />
+ <ClCompile Include="..\rfs_server_src\net_win32.c" />
+ <ClCompile Include="..\rfs_server_src\os_io_win32.c" />
+ <ClCompile Include="..\rfs_server_src\rfs_transports.c" />
+ <ClCompile Include="..\rfs_server_src\serial_win32.c" />
+ <ClCompile Include="..\rfs_server_src\server.c" />
+ <ClCompile Include="..\src\eluarpc.c" />
+ <ClCompile Include="..\src\remotefs\remotefs.c" />
+ <ClCompile Include="main.c" />
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <ProjectGuid>{68EE7183-C1E2-41A9-AADA-3456B4773685}</ProjectGuid>
+ <Keyword>Win32Proj</Keyword>
+ <RootNamespace>mux</RootNamespace>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseDebugLibraries>true</UseDebugLibraries>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseDebugLibraries>false</UseDebugLibraries>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </ImportGroup>
+ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <LinkIncremental>true</LinkIncremental>
+ <IncludePath>..\rfs_server_src;..\inc;..\inc\remotefs;$(IncludePath)</IncludePath>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <LinkIncremental>false</LinkIncremental>
+ <IncludePath>..\rfs_server_src;..\inc;..\inc\remotefs;$(IncludePath)</IncludePath>
+ </PropertyGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <ClCompile>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <WarningLevel>Level3</WarningLevel>
+ <Optimization>Disabled</Optimization>
+ <PreprocessorDefinitions>WIN32_BUILD;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <Link>
+ <SubSystem>Console</SubSystem>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <AdditionalDependencies>Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <EntryPointSymbol>
+ </EntryPointSymbol>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <ClCompile>
+ <WarningLevel>Level3</WarningLevel>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <Optimization>MaxSpeed</Optimization>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <PreprocessorDefinitions>WIN32_BUILD;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <Link>
+ <SubSystem>Console</SubSystem>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <OptimizeReferences>true</OptimizeReferences>
+ <AdditionalDependencies>Ws2_32.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;%(AdditionalDependencies)</AdditionalDependencies>
+ </Link>
+ </ItemDefinitionGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
+</Project>
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup>
+ <ClCompile Include="..\rfs_server_src\deskutils.c">
+ <Filter>source</Filter>
+ </ClCompile>
+ <ClCompile Include="..\rfs_server_src\server.c">
+ <Filter>source</Filter>
+ </ClCompile>
+ <ClCompile Include="..\src\eluarpc.c">
+ <Filter>source</Filter>
+ </ClCompile>
+ <ClCompile Include="..\rfs_server_src\log.c">
+ <Filter>source</Filter>
+ </ClCompile>
+ <ClCompile Include="main.c">
+ <Filter>source</Filter>
+ </ClCompile>
+ <ClCompile Include="..\rfs_server_src\net_win32.c">
+ <Filter>source</Filter>
+ </ClCompile>
+ <ClCompile Include="..\rfs_server_src\os_io_win32.c">
+ <Filter>source</Filter>
+ </ClCompile>
+ <ClCompile Include="..\src\remotefs\remotefs.c">
+ <Filter>source</Filter>
+ </ClCompile>
+ <ClCompile Include="..\rfs_server_src\rfs_transports.c">
+ <Filter>source</Filter>
+ </ClCompile>
+ <ClCompile Include="..\rfs_server_src\serial_win32.c">
+ <Filter>source</Filter>
+ </ClCompile>
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="config.h">
+ <Filter>headers</Filter>
+ </ClInclude>
+ <ClInclude Include="..\rfs_server_src\deskutils.h">
+ <Filter>headers</Filter>
+ </ClInclude>
+ <ClInclude Include="..\rfs_server_src\log.h">
+ <Filter>headers</Filter>
+ </ClInclude>
+ <ClInclude Include="..\rfs_server_src\net.h">
+ <Filter>headers</Filter>
+ </ClInclude>
+ <ClInclude Include="..\rfs_server_src\rfs.h">
+ <Filter>headers</Filter>
+ </ClInclude>
+ <ClInclude Include="..\rfs_server_src\rfs_transports.h">
+ <Filter>headers</Filter>
+ </ClInclude>
+ <ClInclude Include="..\rfs_server_src\serial.h">
+ <Filter>headers</Filter>
+ </ClInclude>
+ <ClInclude Include="..\rfs_server_src\server.h">
+ <Filter>headers</Filter>
+ </ClInclude>
+ </ItemGroup>
+ <ItemGroup>
+ <Filter Include="source">
+ <UniqueIdentifier>{edd07642-0c4f-4725-9e8f-641858b5e631}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="headers">
+ <UniqueIdentifier>{7234826d-2dcc-404c-9472-998da14f1314}</UniqueIdentifier>
+ </Filter>
+ </ItemGroup>
+</Project>
View
@@ -20,12 +20,12 @@ if utils.is_windows() then
print "SIM target not supported under Windows"
os.exit( 1 )
end
- flist = "main.c server.c os_io_win32.c log.c net_win32.c serial_win32.c deskutils.c"
+ flist = "main.c server.c os_io_win32.c log.c net_win32.c serial_win32.c deskutils.c rfs_transports.c"
cdefs = cdefs .. " WIN32_BUILD"
exeprefix = ".exe"
socklib = 'ws2_32'
else
- flist = mainname .. " server.c os_io_posix.c log.c net_posix.c serial_posix.c deskutils.c"
+ flist = mainname .. " server.c os_io_posix.c log.c net_posix.c serial_posix.c deskutils.c rfs_transports.c"
end
local output = sim == 0 and 'rfs_server' or 'rfs_sim_server'
View
@@ -13,12 +13,12 @@
if sim == '1':
print "SIM target not supported under Windows"
os.exit( 1 )
- flist = "main.c server.c os_io_win32.c log.c net_win32.c serial_win32.c deskutils.c"
+ flist = "main.c server.c os_io_win32.c log.c net_win32.c serial_win32.c deskutils.c rfs_transports.c"
cdefs = cdefs + " -DWIN32_BUILD"
exeprefix = ".exe"
socklib = '-lws2_32'
else:
- flist = "%s server.c os_io_posix.c log.c net_posix.c serial_posix.c deskutils.c" % mainname
+ flist = "%s server.c os_io_posix.c log.c net_posix.c serial_posix.c deskutils.c rfs_transports.c" % mainname
exeprefix = ""
if sim == '0':
Oops, something went wrong.

0 comments on commit d717fc4

Please sign in to comment.