Skip to content

Commit b89ff3e

Browse files
SortaCoreSortaCore
committed
Cleanup of Linux and README
The Linux project would interfere with Windows' output and intermediate files, so moved its output folders so it won't do that. README file had no extension, which meant it slipped past Git and EditorConfig settings on what line endings and encodings to use. It was easier to give it an extension than remake both gitattributes and editorconfig files.
1 parent ee1cec0 commit b89ff3e

File tree

3 files changed

+60
-32
lines changed

3 files changed

+60
-32
lines changed

LICENSE renamed to LICENSE.md

File renamed without changes.

‎bluewing-cpp-server-linux.vcxproj‎

Lines changed: 60 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -47,27 +47,35 @@
4747
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
4848
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration">
4949
<UseDebugLibraries>true</UseDebugLibraries>
50+
<UseOfStl>libstdc++_static</UseOfStl>
5051
</PropertyGroup>
5152
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration">
5253
<UseDebugLibraries>false</UseDebugLibraries>
54+
<UseOfStl>libstdc++_static</UseOfStl>
5355
</PropertyGroup>
5456
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'" Label="Configuration">
5557
<UseDebugLibraries>true</UseDebugLibraries>
58+
<UseOfStl>libstdc++_static</UseOfStl>
5659
</PropertyGroup>
5760
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x86'" Label="Configuration">
5861
<UseDebugLibraries>false</UseDebugLibraries>
62+
<UseOfStl>libstdc++_static</UseOfStl>
5963
</PropertyGroup>
6064
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
6165
<UseDebugLibraries>true</UseDebugLibraries>
66+
<UseOfStl>libstdc++_static</UseOfStl>
6267
</PropertyGroup>
6368
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
6469
<UseDebugLibraries>false</UseDebugLibraries>
70+
<UseOfStl>libstdc++_static</UseOfStl>
6571
</PropertyGroup>
6672
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
6773
<UseDebugLibraries>false</UseDebugLibraries>
74+
<UseOfStl>libstdc++_static</UseOfStl>
6875
</PropertyGroup>
6976
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
7077
<UseDebugLibraries>true</UseDebugLibraries>
78+
<UseOfStl>libstdc++_static</UseOfStl>
7179
</PropertyGroup>
7280
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
7381
<ImportGroup Label="ExtensionSettings" />
@@ -76,43 +84,67 @@
7684
<PropertyGroup Label="UserMacros" />
7785
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
7886
<RemoteCppCompileToolExe>g++-8</RemoteCppCompileToolExe>
79-
<OutDir>$(ProjectDir)$(Platform)\$(Configuration)\</OutDir>
80-
<IntDir>$(ProjectDir)$(Platform)\$(Configuration)\</IntDir>
87+
<OutDir>$(ProjectDir)Linux\$(Platform)\$(Configuration)\</OutDir>
88+
<IntDir>$(ProjectDir)Linux\$(Platform)\$(Configuration)\</IntDir>
89+
<RemoteIntRelDir>$(RemoteProjectRelDir)/Linux/$(Platform)/$(Configuration)</RemoteIntRelDir>
90+
<RemoteOutRelDir>$(RemoteProjectRelDir)/Linux/$(Platform)/$(Configuration)</RemoteOutRelDir>
91+
<RemoteLdToolExe>g++-8</RemoteLdToolExe>
8192
</PropertyGroup>
8293
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
8394
<RemoteCppCompileToolExe>g++-8</RemoteCppCompileToolExe>
84-
<OutDir>$(ProjectDir)$(Platform)\$(Configuration)\</OutDir>
85-
<IntDir>$(ProjectDir)$(Platform)\$(Configuration)\</IntDir>
95+
<OutDir>$(ProjectDir)Linux\$(Platform)\$(Configuration)\</OutDir>
96+
<IntDir>$(ProjectDir)Linux\$(Platform)\$(Configuration)\</IntDir>
97+
<RemoteIntRelDir>$(RemoteProjectRelDir)/Linux/$(Platform)/$(Configuration)</RemoteIntRelDir>
98+
<RemoteOutRelDir>$(RemoteProjectRelDir)/Linux/$(Platform)/$(Configuration)</RemoteOutRelDir>
99+
<RemoteLdToolExe>g++-8</RemoteLdToolExe>
86100
</PropertyGroup>
87101
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
88102
<RemoteCppCompileToolExe>g++-8</RemoteCppCompileToolExe>
89-
<OutDir>$(ProjectDir)$(Platform)\$(Configuration)\</OutDir>
90-
<IntDir>$(ProjectDir)$(Platform)\$(Configuration)\</IntDir>
103+
<OutDir>$(ProjectDir)Linux\$(Platform)\$(Configuration)\</OutDir>
104+
<IntDir>$(ProjectDir)Linux\$(Platform)\$(Configuration)\</IntDir>
105+
<RemoteIntRelDir>$(RemoteProjectRelDir)/Linux/$(Platform)/$(Configuration)</RemoteIntRelDir>
106+
<RemoteOutRelDir>$(RemoteProjectRelDir)/Linux/$(Platform)/$(Configuration)</RemoteOutRelDir>
107+
<RemoteLdToolExe>g++-8</RemoteLdToolExe>
91108
</PropertyGroup>
92109
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
93110
<RemoteCppCompileToolExe>g++-8</RemoteCppCompileToolExe>
94-
<OutDir>$(ProjectDir)$(Platform)\$(Configuration)\</OutDir>
95-
<IntDir>$(ProjectDir)$(Platform)\$(Configuration)\</IntDir>
111+
<OutDir>$(ProjectDir)Linux\$(Platform)\$(Configuration)\</OutDir>
112+
<IntDir>$(ProjectDir)Linux\$(Platform)\$(Configuration)\</IntDir>
113+
<RemoteIntRelDir>$(RemoteProjectRelDir)/Linux/$(Platform)/$(Configuration)</RemoteIntRelDir>
114+
<RemoteOutRelDir>$(RemoteProjectRelDir)/Linux/$(Platform)/$(Configuration)</RemoteOutRelDir>
115+
<RemoteLdToolExe>g++-8</RemoteLdToolExe>
96116
</PropertyGroup>
97117
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
98118
<RemoteCppCompileToolExe>g++-8</RemoteCppCompileToolExe>
99-
<OutDir>$(ProjectDir)$(Platform)\$(Configuration)\</OutDir>
100-
<IntDir>$(ProjectDir)$(Platform)\$(Configuration)\</IntDir>
119+
<OutDir>$(ProjectDir)Linux\$(Platform)\$(Configuration)\</OutDir>
120+
<IntDir>$(ProjectDir)Linux\$(Platform)\$(Configuration)\</IntDir>
121+
<RemoteIntRelDir>$(RemoteProjectRelDir)/Linux/$(Platform)/$(Configuration)</RemoteIntRelDir>
122+
<RemoteOutRelDir>$(RemoteProjectRelDir)/Linux/$(Platform)/$(Configuration)</RemoteOutRelDir>
123+
<RemoteLdToolExe>g++-8</RemoteLdToolExe>
101124
</PropertyGroup>
102125
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
103126
<RemoteCppCompileToolExe>g++-8</RemoteCppCompileToolExe>
104-
<OutDir>$(ProjectDir)$(Platform)\$(Configuration)\</OutDir>
105-
<IntDir>$(ProjectDir)$(Platform)\$(Configuration)\</IntDir>
127+
<OutDir>$(ProjectDir)Linux\$(Platform)\$(Configuration)\</OutDir>
128+
<IntDir>$(ProjectDir)Linux\$(Platform)\$(Configuration)\</IntDir>
129+
<RemoteIntRelDir>$(RemoteProjectRelDir)/Linux/$(Platform)/$(Configuration)</RemoteIntRelDir>
130+
<RemoteOutRelDir>$(RemoteProjectRelDir)/Linux/$(Platform)/$(Configuration)</RemoteOutRelDir>
131+
<RemoteLdToolExe>g++-8</RemoteLdToolExe>
106132
</PropertyGroup>
107133
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'">
108134
<RemoteCppCompileToolExe>g++-8</RemoteCppCompileToolExe>
109-
<OutDir>$(ProjectDir)$(Platform)\$(Configuration)\</OutDir>
110-
<IntDir>$(ProjectDir)$(Platform)\$(Configuration)\</IntDir>
135+
<OutDir>$(ProjectDir)Linux\$(Platform)\$(Configuration)\</OutDir>
136+
<IntDir>$(ProjectDir)Linux\$(Platform)\$(Configuration)\</IntDir>
137+
<RemoteIntRelDir>$(RemoteProjectRelDir)/Linux/$(Platform)/$(Configuration)</RemoteIntRelDir>
138+
<RemoteOutRelDir>$(RemoteProjectRelDir)/Linux/$(Platform)/$(Configuration)</RemoteOutRelDir>
139+
<RemoteLdToolExe>g++-8</RemoteLdToolExe>
111140
</PropertyGroup>
112141
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x86'">
113142
<RemoteCppCompileToolExe>g++-8</RemoteCppCompileToolExe>
114-
<OutDir>$(ProjectDir)$(Platform)\$(Configuration)\</OutDir>
115-
<IntDir>$(ProjectDir)$(Platform)\$(Configuration)\</IntDir>
143+
<OutDir>$(ProjectDir)Linux\$(Platform)\$(Configuration)\</OutDir>
144+
<IntDir>$(ProjectDir)Linux\$(Platform)\$(Configuration)\</IntDir>
145+
<RemoteIntRelDir>$(RemoteProjectRelDir)/Linux/$(Platform)/$(Configuration)</RemoteIntRelDir>
146+
<RemoteOutRelDir>$(RemoteProjectRelDir)/Linux/$(Platform)/$(Configuration)</RemoteOutRelDir>
147+
<RemoteLdToolExe>g++-8</RemoteLdToolExe>
116148
</PropertyGroup>
117149
<ItemGroup>
118150
<ClCompile Include="Lacewing\CodePointAllowList.cpp" />
@@ -176,7 +208,6 @@
176208
<ClInclude Include="Lacewing\FrameBuilder.h" />
177209
<ClInclude Include="Lacewing\FrameReader.h" />
178210
<ClInclude Include="Lacewing\IDPool.h" />
179-
<ClInclude Include="Lacewing\include\lacewing.h" />
180211
<ClInclude Include="Lacewing\Lacewing.h" />
181212
<ClInclude Include="Lacewing\MessageBuilder.h" />
182213
<ClInclude Include="Lacewing\MessageReader.h" />
@@ -200,10 +231,10 @@
200231
</ItemGroup>
201232
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
202233
<ClCompile>
203-
<PreprocessorDefinitions>_lacewing_static;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
234+
<PreprocessorDefinitions>_lacewing_static;_DEBUG;_lacewing_debug=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
204235
<CppLanguageStandard>c++17</CppLanguageStandard>
205-
<CompileAs>CompileAsCpp</CompileAs>
206236
<AdditionalOptions>-Wno-unknown-pragmas %(AdditionalOptions)</AdditionalOptions>
237+
<CompileAs>CompileAsCpp</CompileAs>
207238
</ClCompile>
208239
<Link>
209240
<LibraryDependencies>pthread</LibraryDependencies>
@@ -213,19 +244,19 @@
213244
<ClCompile>
214245
<PreprocessorDefinitions>_lacewing_static;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
215246
<CppLanguageStandard>c++17</CppLanguageStandard>
216-
<CompileAs>CompileAsCpp</CompileAs>
217247
<AdditionalOptions>-Wno-unknown-pragmas %(AdditionalOptions)</AdditionalOptions>
248+
<CompileAs>CompileAsCpp</CompileAs>
218249
</ClCompile>
219250
<Link>
220251
<LibraryDependencies>pthread</LibraryDependencies>
221252
</Link>
222253
</ItemDefinitionGroup>
223254
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
224255
<ClCompile>
225-
<PreprocessorDefinitions>_lacewing_static;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
256+
<PreprocessorDefinitions>_lacewing_static;_DEBUG;_lacewing_debug=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
226257
<CppLanguageStandard>c++17</CppLanguageStandard>
227-
<CompileAs>CompileAsCpp</CompileAs>
228258
<AdditionalOptions>-Wno-unknown-pragmas %(AdditionalOptions)</AdditionalOptions>
259+
<CompileAs>CompileAsCpp</CompileAs>
229260
</ClCompile>
230261
<Link>
231262
<LibraryDependencies>pthread</LibraryDependencies>
@@ -235,19 +266,19 @@
235266
<ClCompile>
236267
<PreprocessorDefinitions>_lacewing_static;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
237268
<CppLanguageStandard>c++17</CppLanguageStandard>
238-
<CompileAs>CompileAsCpp</CompileAs>
239269
<AdditionalOptions>-Wno-unknown-pragmas %(AdditionalOptions)</AdditionalOptions>
270+
<CompileAs>CompileAsCpp</CompileAs>
240271
</ClCompile>
241272
<Link>
242273
<LibraryDependencies>pthread</LibraryDependencies>
243274
</Link>
244275
</ItemDefinitionGroup>
245276
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
246277
<ClCompile>
247-
<PreprocessorDefinitions>_lacewing_static;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
278+
<PreprocessorDefinitions>_lacewing_static;_DEBUG;_lacewing_debug=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
248279
<CppLanguageStandard>c++17</CppLanguageStandard>
249-
<CompileAs>CompileAsCpp</CompileAs>
250280
<AdditionalOptions>-Wno-unknown-pragmas %(AdditionalOptions)</AdditionalOptions>
281+
<CompileAs>CompileAsCpp</CompileAs>
251282
</ClCompile>
252283
<Link>
253284
<LibraryDependencies>pthread</LibraryDependencies>
@@ -257,19 +288,19 @@
257288
<ClCompile>
258289
<PreprocessorDefinitions>_lacewing_static;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
259290
<CppLanguageStandard>c++17</CppLanguageStandard>
260-
<CompileAs>CompileAsCpp</CompileAs>
261291
<AdditionalOptions>-Wno-unknown-pragmas %(AdditionalOptions)</AdditionalOptions>
292+
<CompileAs>CompileAsCpp</CompileAs>
262293
</ClCompile>
263294
<Link>
264295
<LibraryDependencies>pthread</LibraryDependencies>
265296
</Link>
266297
</ItemDefinitionGroup>
267298
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'">
268299
<ClCompile>
269-
<PreprocessorDefinitions>_lacewing_static;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
300+
<PreprocessorDefinitions>_lacewing_static;_DEBUG;_lacewing_debug=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
270301
<CppLanguageStandard>c++17</CppLanguageStandard>
271-
<CompileAs>CompileAsCpp</CompileAs>
272302
<AdditionalOptions>-Wno-unknown-pragmas %(AdditionalOptions)</AdditionalOptions>
303+
<CompileAs>CompileAsCpp</CompileAs>
273304
</ClCompile>
274305
<Link>
275306
<LibraryDependencies>pthread</LibraryDependencies>
@@ -279,8 +310,8 @@
279310
<ClCompile>
280311
<PreprocessorDefinitions>_lacewing_static;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
281312
<CppLanguageStandard>c++17</CppLanguageStandard>
282-
<CompileAs>CompileAsCpp</CompileAs>
283313
<AdditionalOptions>-Wno-unknown-pragmas %(AdditionalOptions)</AdditionalOptions>
314+
<CompileAs>CompileAsCpp</CompileAs>
284315
</ClCompile>
285316
<Link>
286317
<LibraryDependencies>pthread</LibraryDependencies>

‎bluewing-cpp-server-linux.vcxproj.filters‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -275,9 +275,6 @@
275275
<ClInclude Include="Lacewing\src\unix\unix config.h">
276276
<Filter>Header Files\Lacewing\src\unix</Filter>
277277
</ClInclude>
278-
<ClInclude Include="Lacewing\include\lacewing.h">
279-
<Filter>Source Files\Lacewing\include</Filter>
280-
</ClInclude>
281278
<ClInclude Include="Lacewing\deps\uthash\utarray.h">
282279
<Filter>Header Files\Lacewing\src\deps\uthash</Filter>
283280
</ClInclude>

0 commit comments

Comments
 (0)