Skip to content

Commit d3b3ff5

Browse files
end2endzoneend2endzone
committed
* Moved each project source files into their own folder.
(required for issue #9 - Make source code cross-platform)
1 parent 04994a6 commit d3b3ff5

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+142
-137
lines changed

‎msvc/bin2cpp.vcxproj‎

Lines changed: 21 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@
5555
</PrecompiledHeader>
5656
<WarningLevel>Level4</WarningLevel>
5757
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
58+
<AdditionalIncludeDirectories>..\src\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
5859
</ClCompile>
5960
<Link>
6061
<GenerateDebugInformation>true</GenerateDebugInformation>
@@ -73,6 +74,7 @@
7374
</PrecompiledHeader>
7475
<WarningLevel>Level4</WarningLevel>
7576
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
77+
<AdditionalIncludeDirectories>..\src\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
7678
</ClCompile>
7779
<Link>
7880
<GenerateDebugInformation>true</GenerateDebugInformation>
@@ -88,26 +90,29 @@
8890
</CustomBuildStep>
8991
</ItemGroup>
9092
<ItemGroup>
91-
<ClCompile Include="..\src\ArrayGenerator.cpp" />
92-
<ClCompile Include="..\src\BaseGenerator.cpp" />
93-
<ClCompile Include="..\src\main.cpp" />
94-
<ClCompile Include="..\src\SegmentGenerator.cpp" />
95-
<ClCompile Include="..\src\StringGenerator.cpp" />
96-
<ClCompile Include="..\src\Win32ResourceGenerator.cpp" />
93+
<ProjectReference Include="common.vcxproj">
94+
<Project>{0a65f8bd-6bb4-4a78-a871-25b99b43021a}</Project>
95+
</ProjectReference>
9796
</ItemGroup>
9897
<ItemGroup>
99-
<ClInclude Include="..\src\ArrayGenerator.h" />
100-
<ClInclude Include="..\src\BaseGenerator.h" />
101-
<ClInclude Include="..\src\IGenerator.h" />
102-
<ClInclude Include="..\src\SegmentGenerator.h" />
103-
<ClInclude Include="..\src\StringGenerator.h" />
104-
<ClInclude Include="..\src\targetver.h" />
105-
<ClInclude Include="..\src\Win32ResourceGenerator.h" />
98+
<ClCompile Include="..\src\bin2cpp\ArrayGenerator.cpp" />
99+
<ClCompile Include="..\src\bin2cpp\BaseGenerator.cpp" />
100+
<ClCompile Include="..\src\bin2cpp\main.cpp" />
101+
<ClCompile Include="..\src\bin2cpp\SegmentGenerator.cpp" />
102+
<ClCompile Include="..\src\bin2cpp\StringGenerator.cpp" />
103+
<ClCompile Include="..\src\bin2cpp\Win32ResourceGenerator.cpp" />
106104
</ItemGroup>
107105
<ItemGroup>
108-
<ProjectReference Include="common.vcxproj">
109-
<Project>{0a65f8bd-6bb4-4a78-a871-25b99b43021a}</Project>
110-
</ProjectReference>
106+
<ClInclude Include="..\src\bin2cpp\ArrayGenerator.h" />
107+
<ClInclude Include="..\src\bin2cpp\BaseGenerator.h" />
108+
<ClInclude Include="..\src\bin2cpp\IGenerator.h" />
109+
<ClInclude Include="..\src\bin2cpp\SegmentGenerator.h" />
110+
<ClInclude Include="..\src\bin2cpp\StringGenerator.h" />
111+
<ClInclude Include="..\src\bin2cpp\targetver.h" />
112+
<ClInclude Include="..\src\bin2cpp\Win32ResourceGenerator.h" />
113+
</ItemGroup>
114+
<ItemGroup>
115+
<None Include="..\src\bin2cpp\bin2cpp.samples.txt" />
111116
</ItemGroup>
112117
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
113118
<ImportGroup Label="ExtensionTargets">

‎msvc/bin2cpp.vcxproj.filters‎

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -15,46 +15,49 @@
1515
</Filter>
1616
</ItemGroup>
1717
<ItemGroup>
18-
<ClCompile Include="..\src\main.cpp">
18+
<ClCompile Include="..\src\bin2cpp\ArrayGenerator.cpp">
1919
<Filter>Source Files</Filter>
2020
</ClCompile>
21-
<ClCompile Include="..\src\SegmentGenerator.cpp">
21+
<ClCompile Include="..\src\bin2cpp\BaseGenerator.cpp">
2222
<Filter>Source Files</Filter>
2323
</ClCompile>
24-
<ClCompile Include="..\src\StringGenerator.cpp">
24+
<ClCompile Include="..\src\bin2cpp\main.cpp">
2525
<Filter>Source Files</Filter>
2626
</ClCompile>
27-
<ClCompile Include="..\src\ArrayGenerator.cpp">
27+
<ClCompile Include="..\src\bin2cpp\SegmentGenerator.cpp">
2828
<Filter>Source Files</Filter>
2929
</ClCompile>
30-
<ClCompile Include="..\src\BaseGenerator.cpp">
30+
<ClCompile Include="..\src\bin2cpp\StringGenerator.cpp">
3131
<Filter>Source Files</Filter>
3232
</ClCompile>
33-
<ClCompile Include="..\src\Win32ResourceGenerator.cpp">
33+
<ClCompile Include="..\src\bin2cpp\Win32ResourceGenerator.cpp">
3434
<Filter>Source Files</Filter>
3535
</ClCompile>
3636
</ItemGroup>
3737
<ItemGroup>
38-
<ClInclude Include="..\src\targetver.h">
38+
<ClInclude Include="..\src\bin2cpp\ArrayGenerator.h">
3939
<Filter>Header Files</Filter>
4040
</ClInclude>
41-
<ClInclude Include="..\src\IGenerator.h">
41+
<ClInclude Include="..\src\bin2cpp\BaseGenerator.h">
4242
<Filter>Header Files</Filter>
4343
</ClInclude>
44-
<ClInclude Include="..\src\SegmentGenerator.h">
44+
<ClInclude Include="..\src\bin2cpp\IGenerator.h">
4545
<Filter>Header Files</Filter>
4646
</ClInclude>
47-
<ClInclude Include="..\src\StringGenerator.h">
47+
<ClInclude Include="..\src\bin2cpp\SegmentGenerator.h">
4848
<Filter>Header Files</Filter>
4949
</ClInclude>
50-
<ClInclude Include="..\src\ArrayGenerator.h">
50+
<ClInclude Include="..\src\bin2cpp\StringGenerator.h">
5151
<Filter>Header Files</Filter>
5252
</ClInclude>
53-
<ClInclude Include="..\src\BaseGenerator.h">
53+
<ClInclude Include="..\src\bin2cpp\targetver.h">
5454
<Filter>Header Files</Filter>
5555
</ClInclude>
56-
<ClInclude Include="..\src\Win32ResourceGenerator.h">
56+
<ClInclude Include="..\src\bin2cpp\Win32ResourceGenerator.h">
5757
<Filter>Header Files</Filter>
5858
</ClInclude>
5959
</ItemGroup>
60+
<ItemGroup>
61+
<None Include="..\src\bin2cpp\bin2cpp.samples.txt" />
62+
</ItemGroup>
6063
</Project>

‎msvc/bin2cpp_unittest.vcxproj‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
</PreBuildEvent>
5151
<ClCompile>
5252
<Optimization>Disabled</Optimization>
53-
<AdditionalIncludeDirectories>$(GTEST_INCLUDE);..\msvc;..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
53+
<AdditionalIncludeDirectories>$(GTEST_INCLUDE);..\msvc;..\src\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
5454
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
5555
<MinimalRebuild>true</MinimalRebuild>
5656
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -79,7 +79,7 @@
7979
<ClCompile>
8080
<Optimization>MaxSpeed</Optimization>
8181
<IntrinsicFunctions>true</IntrinsicFunctions>
82-
<AdditionalIncludeDirectories>$(GTEST_INCLUDE);..\msvc;..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
82+
<AdditionalIncludeDirectories>$(GTEST_INCLUDE);..\msvc;..\src\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
8383
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
8484
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
8585
<FunctionLevelLinking>true</FunctionLevelLinking>
@@ -103,12 +103,12 @@
103103
</PostBuildEvent>
104104
</ItemDefinitionGroup>
105105
<ItemGroup>
106-
<ClCompile Include="..\test\application.cpp" />
107-
<ClCompile Include="..\test\gtesthelper.cpp" />
108-
<ClCompile Include="..\test\main.cpp" />
109-
<ClCompile Include="..\test\TestCLI.cpp" />
110-
<ClCompile Include="..\test\TestCommon.cpp" />
111-
<ClCompile Include="..\test\TestExtraction.cpp" />
106+
<ClCompile Include="..\src\bin2cpp_unittest\application.cpp" />
107+
<ClCompile Include="..\src\bin2cpp_unittest\gtesthelper.cpp" />
108+
<ClCompile Include="..\src\bin2cpp_unittest\main.cpp" />
109+
<ClCompile Include="..\src\bin2cpp_unittest\TestCLI.cpp" />
110+
<ClCompile Include="..\src\bin2cpp_unittest\TestCommon.cpp" />
111+
<ClCompile Include="..\src\bin2cpp_unittest\TestExtraction.cpp" />
112112
<ClCompile Include="generated_files\testBaseClass\_testBaseClass.cpp" />
113113
<ClCompile Include="generated_files\testEncodingHex\_testEncodingHex.cpp" />
114114
<ClCompile Include="generated_files\testEncodingOct\_testEncodingOct.cpp" />
@@ -150,11 +150,11 @@
150150
<None Include="prebuild.bat" />
151151
</ItemGroup>
152152
<ItemGroup>
153-
<ClInclude Include="..\test\application.h" />
154-
<ClInclude Include="..\test\gtesthelper.h" />
155-
<ClInclude Include="..\test\TestCLI.h" />
156-
<ClInclude Include="..\test\TestCommon.h" />
157-
<ClInclude Include="..\test\TestExtraction.h" />
153+
<ClInclude Include="..\src\bin2cpp_unittest\application.h" />
154+
<ClInclude Include="..\src\bin2cpp_unittest\gtesthelper.h" />
155+
<ClInclude Include="..\src\bin2cpp_unittest\TestCLI.h" />
156+
<ClInclude Include="..\src\bin2cpp_unittest\TestCommon.h" />
157+
<ClInclude Include="..\src\bin2cpp_unittest\TestExtraction.h" />
158158
<ClInclude Include="generated_files\testBaseClass\_testBaseClass.h" />
159159
<ClInclude Include="generated_files\testEncodingHex\_testEncodingHex.h" />
160160
<ClInclude Include="generated_files\testEncodingOct\_testEncodingOct.h" />

‎msvc/bin2cpp_unittest.vcxproj.filters‎

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,6 @@
2424
</Filter>
2525
</ItemGroup>
2626
<ItemGroup>
27-
<ClCompile Include="..\test\gtesthelper.cpp">
28-
<Filter>Source Files</Filter>
29-
</ClCompile>
30-
<ClCompile Include="..\test\main.cpp">
31-
<Filter>Source Files</Filter>
32-
</ClCompile>
33-
<ClCompile Include="..\test\TestExtraction.cpp">
34-
<Filter>Tests</Filter>
35-
</ClCompile>
3627
<ClCompile Include="generated_files\testHtml100000\_testHtml100000.cpp">
3728
<Filter>Generated Files</Filter>
3829
</ClCompile>
@@ -81,18 +72,9 @@
8172
<ClCompile Include="generated_files\testIssue12Mini\_testIssue12Mini.cpp">
8273
<Filter>Generated Files</Filter>
8374
</ClCompile>
84-
<ClCompile Include="..\test\TestCLI.cpp">
85-
<Filter>Tests</Filter>
86-
</ClCompile>
87-
<ClCompile Include="..\test\application.cpp">
88-
<Filter>Tests</Filter>
89-
</ClCompile>
9075
<ClCompile Include="generated_files\testSequential1000\_testSequential1000.cpp">
9176
<Filter>Generated Files</Filter>
9277
</ClCompile>
93-
<ClCompile Include="..\test\TestCommon.cpp">
94-
<Filter>Tests</Filter>
95-
</ClCompile>
9678
<ClCompile Include="generated_files\testGeneratorArray10000\_testGeneratorArray10000.cpp">
9779
<Filter>Generated Files</Filter>
9880
</ClCompile>
@@ -117,6 +99,24 @@
11799
<ClCompile Include="generated_files\testGeneratorWin32\_testGeneratorWin32.cpp">
118100
<Filter>Generated Files</Filter>
119101
</ClCompile>
102+
<ClCompile Include="..\src\bin2cpp_unittest\TestCLI.cpp">
103+
<Filter>Tests</Filter>
104+
</ClCompile>
105+
<ClCompile Include="..\src\bin2cpp_unittest\TestCommon.cpp">
106+
<Filter>Tests</Filter>
107+
</ClCompile>
108+
<ClCompile Include="..\src\bin2cpp_unittest\TestExtraction.cpp">
109+
<Filter>Tests</Filter>
110+
</ClCompile>
111+
<ClCompile Include="..\src\bin2cpp_unittest\application.cpp">
112+
<Filter>Source Files</Filter>
113+
</ClCompile>
114+
<ClCompile Include="..\src\bin2cpp_unittest\gtesthelper.cpp">
115+
<Filter>Source Files</Filter>
116+
</ClCompile>
117+
<ClCompile Include="..\src\bin2cpp_unittest\main.cpp">
118+
<Filter>Source Files</Filter>
119+
</ClCompile>
120120
</ItemGroup>
121121
<ItemGroup>
122122
<None Include="bin2cppTest.x86.debug.xml">
@@ -128,12 +128,6 @@
128128
<None Include="prebuild.bat" />
129129
</ItemGroup>
130130
<ItemGroup>
131-
<ClInclude Include="..\test\gtesthelper.h">
132-
<Filter>Header Files</Filter>
133-
</ClInclude>
134-
<ClInclude Include="..\test\TestExtraction.h">
135-
<Filter>Tests</Filter>
136-
</ClInclude>
137131
<ClInclude Include="generated_files\testHtml100000\_testHtml100000.h">
138132
<Filter>Generated Files</Filter>
139133
</ClInclude>
@@ -182,18 +176,9 @@
182176
<ClInclude Include="generated_files\testIssue12Mini\_testIssue12Mini.h">
183177
<Filter>Generated Files</Filter>
184178
</ClInclude>
185-
<ClInclude Include="..\test\TestCLI.h">
186-
<Filter>Tests</Filter>
187-
</ClInclude>
188-
<ClInclude Include="..\test\application.h">
189-
<Filter>Tests</Filter>
190-
</ClInclude>
191179
<ClInclude Include="generated_files\testSequential1000\_testSequential1000.h">
192180
<Filter>Generated Files</Filter>
193181
</ClInclude>
194-
<ClInclude Include="..\test\TestCommon.h">
195-
<Filter>Tests</Filter>
196-
</ClInclude>
197182
<ClInclude Include="generated_files\testGeneratorArray10000\_testGeneratorArray10000.h">
198183
<Filter>Generated Files</Filter>
199184
</ClInclude>
@@ -218,6 +203,21 @@
218203
<ClInclude Include="generated_files\testGeneratorWin32\_testGeneratorWin32.h">
219204
<Filter>Generated Files</Filter>
220205
</ClInclude>
206+
<ClInclude Include="..\src\bin2cpp_unittest\TestCLI.h">
207+
<Filter>Tests</Filter>
208+
</ClInclude>
209+
<ClInclude Include="..\src\bin2cpp_unittest\TestCommon.h">
210+
<Filter>Tests</Filter>
211+
</ClInclude>
212+
<ClInclude Include="..\src\bin2cpp_unittest\TestExtraction.h">
213+
<Filter>Tests</Filter>
214+
</ClInclude>
215+
<ClInclude Include="..\src\bin2cpp_unittest\application.h">
216+
<Filter>Header Files</Filter>
217+
</ClInclude>
218+
<ClInclude Include="..\src\bin2cpp_unittest\gtesthelper.h">
219+
<Filter>Header Files</Filter>
220+
</ClInclude>
221221
</ItemGroup>
222222
<ItemGroup>
223223
<CustomBuild Include="generate_test_files.bat" />

‎msvc/common.vcxproj‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,24 @@
1010
<Platform>Win32</Platform>
1111
</ProjectConfiguration>
1212
</ItemGroup>
13+
<ItemGroup>
14+
<ClCompile Include="..\src\common\argumentparser.cpp" />
15+
<ClCompile Include="..\src\common\common.cpp" />
16+
<ClCompile Include="..\src\common\cppencoder.cpp" />
17+
<ClCompile Include="..\src\common\environmentfunc.cpp" />
18+
<ClCompile Include="..\src\common\filesystemfunc.cpp" />
19+
<ClCompile Include="..\src\common\logger.cpp" />
20+
<ClCompile Include="..\src\common\stringfunc.cpp" />
21+
</ItemGroup>
22+
<ItemGroup>
23+
<ClInclude Include="..\src\common\argumentparser.h" />
24+
<ClInclude Include="..\src\common\common.h" />
25+
<ClInclude Include="..\src\common\cppencoder.h" />
26+
<ClInclude Include="..\src\common\environmentfunc.h" />
27+
<ClInclude Include="..\src\common\filesystemfunc.h" />
28+
<ClInclude Include="..\src\common\logger.h" />
29+
<ClInclude Include="..\src\common\stringfunc.h" />
30+
</ItemGroup>
1331
<PropertyGroup Label="Globals">
1432
<ProjectGuid>{0A65F8BD-6BB4-4A78-A871-25B99B43021A}</ProjectGuid>
1533
<Keyword>Win32Proj</Keyword>
@@ -76,24 +94,6 @@
7694
<OptimizeReferences>true</OptimizeReferences>
7795
</Link>
7896
</ItemDefinitionGroup>
79-
<ItemGroup>
80-
<ClCompile Include="..\src\argumentparser.cpp" />
81-
<ClCompile Include="..\src\common.cpp" />
82-
<ClCompile Include="..\src\cppencoder.cpp" />
83-
<ClCompile Include="..\src\environmentfunc.cpp" />
84-
<ClCompile Include="..\src\filesystemfunc.cpp" />
85-
<ClCompile Include="..\src\logger.cpp" />
86-
<ClCompile Include="..\src\stringfunc.cpp" />
87-
</ItemGroup>
88-
<ItemGroup>
89-
<ClInclude Include="..\src\argumentparser.h" />
90-
<ClInclude Include="..\src\common.h" />
91-
<ClInclude Include="..\src\cppencoder.h" />
92-
<ClInclude Include="..\src\environmentfunc.h" />
93-
<ClInclude Include="..\src\filesystemfunc.h" />
94-
<ClInclude Include="..\src\logger.h" />
95-
<ClInclude Include="..\src\stringfunc.h" />
96-
</ItemGroup>
9797
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
9898
<ImportGroup Label="ExtensionTargets">
9999
</ImportGroup>

0 commit comments

Comments
 (0)