Skip to content

Commit bb50d63

Browse files
committed
1 parent b38e79c commit bb50d63

File tree

5 files changed

+46
-170
lines changed

5 files changed

+46
-170
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,9 +104,9 @@ jobs:
104104
msbuild-architecture: x64
105105
- uses: nuget/setup-nuget@v2
106106
- name: Restore NuGet packages
107-
run: nuget restore Poedit.sln
107+
run: nuget restore Poedit.slnx
108108
- name: Build solution
109-
run: msbuild Poedit.sln /p:configuration=Debug
109+
run: msbuild Poedit.slnx /p:configuration=Debug
110110

111111
publish-release:
112112
name: Publish release tarball

Poedit.sln

Lines changed: 0 additions & 165 deletions
This file was deleted.

Poedit.slnx

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
<Solution>
2+
<Configurations>
3+
<Platform Name="x64" />
4+
</Configurations>
5+
<Folder Name="/Dependencies/">
6+
<Project Path="deps/custom_build/boost.vcxproj" Id="88a0ad6e-0e9b-5fcb-801a-6f6531c7577b" />
7+
<Project Path="deps/custom_build/cld2.vcxproj" Id="0f2968c8-6b72-52c5-857d-c1bbda8e9dd0" />
8+
<Project Path="deps/custom_build/cpprestsdk.vcxproj" Id="15f3b200-1aed-4b57-af37-b21cd67914b1" />
9+
<Project Path="deps/custom_build/mctrl.vcxproj" Id="c3f44d23-c639-5285-94a4-70f3a2a46541" />
10+
<Project Path="deps/custom_build/wx_adv.vcxproj" Id="24c45343-fd20-5c92-81c1-35a2ae841e79" />
11+
<Project Path="deps/custom_build/wx_base.vcxproj" Id="3fcc50c2-81e9-5db2-b8d8-2129427568b1" />
12+
<Project Path="deps/custom_build/wx_core.vcxproj" Id="6744dad8-9c70-574a-bff2-9f8dddb24a75" />
13+
<Project Path="deps/custom_build/wx_net.vcxproj" Id="69f2ede4-7d21-5738-9bc0-f66f61c9ae00" />
14+
<Project Path="deps/custom_build/wx_qa.vcxproj" Id="e21129e0-7c08-5936-9d8c-0d60b5319ba7" />
15+
<Project Path="deps/custom_build/wx_webview.vcxproj" Id="a8e8442a-078a-5fc5-b495-8d71ba77ee6e" />
16+
<Project Path="deps/custom_build/wx_wxpng.vcxproj" Id="8acc122a-ca6a-5aa6-9c97-9cdd2e533db0" />
17+
<Project Path="deps/custom_build/wx_wxregex.vcxproj" Id="56a4b526-bb81-5d01-aaa9-16d23bbb169d" />
18+
<Project Path="deps/custom_build/wx_xml.vcxproj" Id="3e6dca27-5fa3-53ec-bbd6-2d42294b7ae6" />
19+
<Project Path="deps/custom_build/wx_xrc.vcxproj" Id="09f2f96a-1cc6-5e43-af1d-956ec2a4888d" />
20+
<Project Path="deps/custom_build/zlib.vcxproj" Id="304a6fd9-7ff1-5faa-b095-48f553ddc6f5" />
21+
<Project Path="deps/lucene/LucenePlusPlus.vcxproj" Id="34b37773-23ac-5286-86f7-60c7bf937abb" />
22+
</Folder>
23+
<Folder Name="/Dependencies/Debugging/">
24+
<File Path="deps/boost/assert/extra/boost_assert.natvis" />
25+
<File Path="deps/boost/core/extra/boost_core.natvis" />
26+
<File Path="deps/boost/system/extra/boost_system.natvis" />
27+
<File Path="deps/json/nlohmann_json.natvis" />
28+
<File Path="deps/pugixml/scripts/natvis/pugixml.natvis" />
29+
</Folder>
30+
<Project Path="Poedit.vcxproj" Id="971716fe-f6ad-4c1d-8690-27e243af73f8">
31+
<BuildDependency Project="deps/custom_build/wx_adv.vcxproj" />
32+
<BuildDependency Project="deps/custom_build/wx_base.vcxproj" />
33+
<BuildDependency Project="deps/custom_build/wx_core.vcxproj" />
34+
<BuildDependency Project="deps/custom_build/wx_net.vcxproj" />
35+
<BuildDependency Project="deps/custom_build/wx_qa.vcxproj" />
36+
<BuildDependency Project="deps/custom_build/wx_wxpng.vcxproj" />
37+
<BuildDependency Project="deps/custom_build/wx_wxregex.vcxproj" />
38+
<BuildDependency Project="deps/custom_build/wx_xml.vcxproj" />
39+
<BuildDependency Project="deps/custom_build/wx_xrc.vcxproj" />
40+
</Project>
41+
</Solution>

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ symlinks and so you'll need to enabled [Developer Mode](https://msdn.microsoft.c
6868

6969
git config --global core.symlinks true
7070

71-
After checkout, use the `Poedit.sln` solution to build everything. To build the installer, open `win32/poedit.iss` in Inno Setup and compile the project.
71+
After checkout, use the `Poedit.slnx` solution to build everything. To build the installer, open `win32/poedit.iss` in Inno Setup and compile the project.
7272

7373

7474
### Installing from Git repository

win32/distrib.proj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,14 +51,14 @@
5151

5252
<Target Name="Build">
5353
<MSBuild
54-
Projects="..\Poedit.sln"
54+
Projects="..\Poedit.slnx"
5555
Properties="Configuration=$(Configuration)"
5656
/>
5757
</Target>
5858

5959
<Target Name="Clean">
6060
<MSBuild
61-
Projects="..\Poedit.sln"
61+
Projects="..\Poedit.slnx"
6262
Properties="Configuration=$(Configuration)"
6363
Targets="Clean"
6464
/>

0 commit comments

Comments
 (0)