Skip to content

Commit d717fc4

Browse files
sweetlilmrebogdanm
sweetlilmre
authored and
bogdanm
committed
Merged rfs_server/mux VS2010 compilation patch from Peter Edwards
2 parents abefe29 + 2f529e0 commit d717fc4

14 files changed

+801
-415
lines changed

‎.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,6 @@ inc/romfiles.h
1111
.sconf_temp/
1212
.sconsign.dblite
1313
config.log
14+
mux
15+
rfs_server
1416

‎mux.lua

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ builder:init( args )
66
builder:set_build_mode( builder.BUILD_DIR_LINEARIZED )
77

88
local flist = "main.c"
9-
local rfs_flist = "main.c server.c log.c deskutils.c"
9+
local rfs_flist = "main.c server.c log.c deskutils.c rfs_transports.c"
1010
local cdefs = "RFS_UDP_TRANSPORT RFS_INSIDE_MUX_MODE"
1111
local socklib
1212
if utils.is_windows() then

‎mux.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import os, sys, platform
22

33
flist = "main.c"
4-
rfs_flist = "main.c server.c log.c deskutils.c"
4+
rfs_flist = "main.c server.c log.c deskutils.c rfs_transports.c"
55
cdefs = "-DRFS_UDP_TRANSPORT -DRFS_INSIDE_MUX_MODE"
66
socklib = ''
77
ptlib = ''

‎mux_src/main.c

+5
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,12 @@ static int parse_transport( const char* s )
145145
#define FIRST_SERVICE_IDX 3
146146
#define MIN_ARGC_COUNT 4
147147

148+
#ifdef _MSC_VER
149+
#define strcasecmp _stricmp
150+
int main( int argc, char *argv[] )
151+
#else
148152
int main( int argc, char **argv )
153+
#endif
149154
{
150155
unsigned i;
151156
SERVICE_DATA *tservice;

‎mux_src/mux.vcxproj

+107
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,107 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<ItemGroup Label="ProjectConfigurations">
4+
<ProjectConfiguration Include="Debug|Win32">
5+
<Configuration>Debug</Configuration>
6+
<Platform>Win32</Platform>
7+
</ProjectConfiguration>
8+
<ProjectConfiguration Include="Release|Win32">
9+
<Configuration>Release</Configuration>
10+
<Platform>Win32</Platform>
11+
</ProjectConfiguration>
12+
</ItemGroup>
13+
<ItemGroup>
14+
<ClInclude Include="..\rfs_server_src\deskutils.h" />
15+
<ClInclude Include="..\rfs_server_src\log.h" />
16+
<ClInclude Include="..\rfs_server_src\net.h" />
17+
<ClInclude Include="..\rfs_server_src\rfs.h" />
18+
<ClInclude Include="..\rfs_server_src\rfs_transports.h" />
19+
<ClInclude Include="..\rfs_server_src\serial.h" />
20+
<ClInclude Include="..\rfs_server_src\server.h" />
21+
<ClInclude Include="config.h" />
22+
</ItemGroup>
23+
<ItemGroup>
24+
<ClCompile Include="..\rfs_server_src\deskutils.c" />
25+
<ClCompile Include="..\rfs_server_src\log.c" />
26+
<ClCompile Include="..\rfs_server_src\net_win32.c" />
27+
<ClCompile Include="..\rfs_server_src\os_io_win32.c" />
28+
<ClCompile Include="..\rfs_server_src\rfs_transports.c" />
29+
<ClCompile Include="..\rfs_server_src\serial_win32.c" />
30+
<ClCompile Include="..\rfs_server_src\server.c" />
31+
<ClCompile Include="..\src\eluarpc.c" />
32+
<ClCompile Include="..\src\remotefs\remotefs.c" />
33+
<ClCompile Include="main.c" />
34+
</ItemGroup>
35+
<PropertyGroup Label="Globals">
36+
<ProjectGuid>{68EE7183-C1E2-41A9-AADA-3456B4773685}</ProjectGuid>
37+
<Keyword>Win32Proj</Keyword>
38+
<RootNamespace>mux</RootNamespace>
39+
</PropertyGroup>
40+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
41+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
42+
<ConfigurationType>Application</ConfigurationType>
43+
<UseDebugLibraries>true</UseDebugLibraries>
44+
<CharacterSet>MultiByte</CharacterSet>
45+
</PropertyGroup>
46+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
47+
<ConfigurationType>Application</ConfigurationType>
48+
<UseDebugLibraries>false</UseDebugLibraries>
49+
<WholeProgramOptimization>true</WholeProgramOptimization>
50+
<CharacterSet>MultiByte</CharacterSet>
51+
</PropertyGroup>
52+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
53+
<ImportGroup Label="ExtensionSettings">
54+
</ImportGroup>
55+
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
56+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
57+
</ImportGroup>
58+
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
59+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
60+
</ImportGroup>
61+
<PropertyGroup Label="UserMacros" />
62+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
63+
<LinkIncremental>true</LinkIncremental>
64+
<IncludePath>..\rfs_server_src;..\inc;..\inc\remotefs;$(IncludePath)</IncludePath>
65+
</PropertyGroup>
66+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
67+
<LinkIncremental>false</LinkIncremental>
68+
<IncludePath>..\rfs_server_src;..\inc;..\inc\remotefs;$(IncludePath)</IncludePath>
69+
</PropertyGroup>
70+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
71+
<ClCompile>
72+
<PrecompiledHeader>
73+
</PrecompiledHeader>
74+
<WarningLevel>Level3</WarningLevel>
75+
<Optimization>Disabled</Optimization>
76+
<PreprocessorDefinitions>WIN32_BUILD;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
77+
</ClCompile>
78+
<Link>
79+
<SubSystem>Console</SubSystem>
80+
<GenerateDebugInformation>true</GenerateDebugInformation>
81+
<AdditionalDependencies>Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
82+
<EntryPointSymbol>
83+
</EntryPointSymbol>
84+
</Link>
85+
</ItemDefinitionGroup>
86+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
87+
<ClCompile>
88+
<WarningLevel>Level3</WarningLevel>
89+
<PrecompiledHeader>
90+
</PrecompiledHeader>
91+
<Optimization>MaxSpeed</Optimization>
92+
<FunctionLevelLinking>true</FunctionLevelLinking>
93+
<IntrinsicFunctions>true</IntrinsicFunctions>
94+
<PreprocessorDefinitions>WIN32_BUILD;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
95+
</ClCompile>
96+
<Link>
97+
<SubSystem>Console</SubSystem>
98+
<GenerateDebugInformation>true</GenerateDebugInformation>
99+
<EnableCOMDATFolding>true</EnableCOMDATFolding>
100+
<OptimizeReferences>true</OptimizeReferences>
101+
<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>
102+
</Link>
103+
</ItemDefinitionGroup>
104+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
105+
<ImportGroup Label="ExtensionTargets">
106+
</ImportGroup>
107+
</Project>

‎mux_src/mux.vcxproj.filters

+69
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<ItemGroup>
4+
<ClCompile Include="..\rfs_server_src\deskutils.c">
5+
<Filter>source</Filter>
6+
</ClCompile>
7+
<ClCompile Include="..\rfs_server_src\server.c">
8+
<Filter>source</Filter>
9+
</ClCompile>
10+
<ClCompile Include="..\src\eluarpc.c">
11+
<Filter>source</Filter>
12+
</ClCompile>
13+
<ClCompile Include="..\rfs_server_src\log.c">
14+
<Filter>source</Filter>
15+
</ClCompile>
16+
<ClCompile Include="main.c">
17+
<Filter>source</Filter>
18+
</ClCompile>
19+
<ClCompile Include="..\rfs_server_src\net_win32.c">
20+
<Filter>source</Filter>
21+
</ClCompile>
22+
<ClCompile Include="..\rfs_server_src\os_io_win32.c">
23+
<Filter>source</Filter>
24+
</ClCompile>
25+
<ClCompile Include="..\src\remotefs\remotefs.c">
26+
<Filter>source</Filter>
27+
</ClCompile>
28+
<ClCompile Include="..\rfs_server_src\rfs_transports.c">
29+
<Filter>source</Filter>
30+
</ClCompile>
31+
<ClCompile Include="..\rfs_server_src\serial_win32.c">
32+
<Filter>source</Filter>
33+
</ClCompile>
34+
</ItemGroup>
35+
<ItemGroup>
36+
<ClInclude Include="config.h">
37+
<Filter>headers</Filter>
38+
</ClInclude>
39+
<ClInclude Include="..\rfs_server_src\deskutils.h">
40+
<Filter>headers</Filter>
41+
</ClInclude>
42+
<ClInclude Include="..\rfs_server_src\log.h">
43+
<Filter>headers</Filter>
44+
</ClInclude>
45+
<ClInclude Include="..\rfs_server_src\net.h">
46+
<Filter>headers</Filter>
47+
</ClInclude>
48+
<ClInclude Include="..\rfs_server_src\rfs.h">
49+
<Filter>headers</Filter>
50+
</ClInclude>
51+
<ClInclude Include="..\rfs_server_src\rfs_transports.h">
52+
<Filter>headers</Filter>
53+
</ClInclude>
54+
<ClInclude Include="..\rfs_server_src\serial.h">
55+
<Filter>headers</Filter>
56+
</ClInclude>
57+
<ClInclude Include="..\rfs_server_src\server.h">
58+
<Filter>headers</Filter>
59+
</ClInclude>
60+
</ItemGroup>
61+
<ItemGroup>
62+
<Filter Include="source">
63+
<UniqueIdentifier>{edd07642-0c4f-4725-9e8f-641858b5e631}</UniqueIdentifier>
64+
</Filter>
65+
<Filter Include="headers">
66+
<UniqueIdentifier>{7234826d-2dcc-404c-9472-998da14f1314}</UniqueIdentifier>
67+
</Filter>
68+
</ItemGroup>
69+
</Project>

‎rfs_server.lua

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@ if utils.is_windows() then
2020
print "SIM target not supported under Windows"
2121
os.exit( 1 )
2222
end
23-
flist = "main.c server.c os_io_win32.c log.c net_win32.c serial_win32.c deskutils.c"
23+
flist = "main.c server.c os_io_win32.c log.c net_win32.c serial_win32.c deskutils.c rfs_transports.c"
2424
cdefs = cdefs .. " WIN32_BUILD"
2525
exeprefix = ".exe"
2626
socklib = 'ws2_32'
2727
else
28-
flist = mainname .. " server.c os_io_posix.c log.c net_posix.c serial_posix.c deskutils.c"
28+
flist = mainname .. " server.c os_io_posix.c log.c net_posix.c serial_posix.c deskutils.c rfs_transports.c"
2929
end
3030

3131
local output = sim == 0 and 'rfs_server' or 'rfs_sim_server'

‎rfs_server.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@
1313
if sim == '1':
1414
print "SIM target not supported under Windows"
1515
os.exit( 1 )
16-
flist = "main.c server.c os_io_win32.c log.c net_win32.c serial_win32.c deskutils.c"
16+
flist = "main.c server.c os_io_win32.c log.c net_win32.c serial_win32.c deskutils.c rfs_transports.c"
1717
cdefs = cdefs + " -DWIN32_BUILD"
1818
exeprefix = ".exe"
1919
socklib = '-lws2_32'
2020
else:
21-
flist = "%s server.c os_io_posix.c log.c net_posix.c serial_posix.c deskutils.c" % mainname
21+
flist = "%s server.c os_io_posix.c log.c net_posix.c serial_posix.c deskutils.c rfs_transports.c" % mainname
2222
exeprefix = ""
2323

2424
if sim == '0':

0 commit comments

Comments
 (0)