Skip to content

Commit c97f598

Browse files
fanc999-1fanc999-1
committed
MSVC builds: Update sigc++ project
Add the new source files and headers from adaptors/lambda, and re-order the source files list into alphabetical order.
1 parent 993aabc commit c97f598

File tree

3 files changed

+45
-37
lines changed

3 files changed

+45
-37
lines changed

‎MSVC_Net2013/libsigc++2.vcxproj

Lines changed: 21 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -128,47 +128,50 @@
128128
<ClCompile Include="..\sigc++\signal.cc" />
129129
<ClCompile Include="..\sigc++\signal_base.cc" />
130130
<ClCompile Include="..\sigc++\trackable.cc" />
131+
<ClCompile Include="..\sigc++\adaptors\lambda\lambda.cc" />
131132
<ClCompile Include="..\sigc++\functors\slot.cc" />
132133
<ClCompile Include="..\sigc++\functors\slot_base.cc" />
133134
</ItemGroup>
134135
<ItemGroup>
135-
<ClInclude Include="..\sigc++\adaptors\adaptor_trait.h" />
136-
<ClInclude Include="..\sigc++\adaptors\adaptors.h" />
137-
<ClInclude Include="..\sigc++\adaptors\bound_argument.h" />
138-
<ClInclude Include="..\sigc++\adaptors\track_obj.h" />
139136
<ClInclude Include="..\sigc++\bind.h" />
140-
<ClInclude Include="..\sigc++\adaptors\bind.h" />
141-
<ClInclude Include="..\sigc++\adaptors\bind_return.h" />
142137
<ClInclude Include="..\sigc++\bind_return.h" />
143138
<ClInclude Include="..\sigc++\class_slot.h" />
144-
<ClInclude Include="..\sigc++\adaptors\compose.h" />
145139
<ClInclude Include="..\sigc++\connection.h" />
146-
<ClInclude Include="..\sigc++\adaptors\deduce_result_type.h" />
147-
<ClInclude Include="..\sigc++\adaptors\exception_catch.h" />
148-
<ClInclude Include="..\sigc++\functors\functor_trait.h" />
149-
<ClInclude Include="..\sigc++\functors\functors.h" />
150140
<ClInclude Include="..\sigc++\hide.h" />
151-
<ClInclude Include="..\sigc++\adaptors\hide.h" />
152-
<ClInclude Include="..\sigc++\functors\mem_fun.h" />
153141
<ClInclude Include="..\sigc++\limit_reference.h" />
154142
<ClInclude Include="..\sigc++\method_slot.h" />
155143
<ClInclude Include="..\sigc++\object.h" />
156144
<ClInclude Include="..\sigc++\object_slot.h" />
157-
<ClInclude Include="..\sigc++\functors\ptr_fun.h" />
158145
<ClInclude Include="..\sigc++\reference_wrapper.h" />
159-
<ClInclude Include="..\sigc++\adaptors\retype.h" />
160146
<ClInclude Include="..\sigc++\retype.h" />
161147
<ClInclude Include="..\sigc++\retype_return.h" />
162-
<ClInclude Include="..\sigc++\adaptors\retype_return.h" />
163148
<ClInclude Include="..\sigc++\sigc++.h" />
164149
<ClInclude Include="..\sigc++\signal.h" />
165150
<ClInclude Include="..\sigc++\signal_base.h" />
166-
<ClInclude Include="..\sigc++\functors\slot.h" />
167151
<ClInclude Include="..\sigc++\slot.h" />
168-
<ClInclude Include="..\sigc++\functors\slot_base.h" />
169152
<ClInclude Include="..\sigc++\trackable.h" />
170153
<ClInclude Include="..\sigc++\type_traits.h" />
171154
<ClInclude Include="..\sigc++\visit_each.h" />
155+
<ClInclude Include="..\sigc++\adaptors\adaptor_trait.h" />
156+
<ClInclude Include="..\sigc++\adaptors\adaptors.h" />
157+
<ClInclude Include="..\sigc++\adaptors\bind.h" />
158+
<ClInclude Include="..\sigc++\adaptors\bind_return.h" />
159+
<ClInclude Include="..\sigc++\adaptors\bound_argument.h" />
160+
<ClInclude Include="..\sigc++\adaptors\compose.h" />
161+
<ClInclude Include="..\sigc++\adaptors\deduce_result_type.h" />
162+
<ClInclude Include="..\sigc++\adaptors\exception_catch.h" />
163+
<ClInclude Include="..\sigc++\adaptors\hide.h" />
164+
<ClInclude Include="..\sigc++\adaptors\retype.h" />
165+
<ClInclude Include="..\sigc++\adaptors\retype_return.h" />
166+
<ClInclude Include="..\sigc++\adaptors\track_obj.h" />
167+
<ClInclude Include="..\sigc++\adaptors\lamdba\base.h" />
168+
<ClInclude Include="..\sigc++\adaptors\lamdba\select.h" />
169+
<ClInclude Include="..\sigc++\functors\functor_trait.h" />
170+
<ClInclude Include="..\sigc++\functors\functors.h" />
171+
<ClInclude Include="..\sigc++\functors\mem_fun.h" />
172+
<ClInclude Include="..\sigc++\functors\ptr_fun.h" />
173+
<ClInclude Include="..\sigc++\functors\slot.h" />
174+
<ClInclude Include="..\sigc++\functors\slot_base.h" />
172175
</ItemGroup>
173176
<ItemGroup>
174177
<ResourceCompile Include="sigc.rc" />

‎MSVC_Net2013/libsigc++2.vcxproj.filters

Lines changed: 21 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -18,48 +18,51 @@
1818
<ClCompile Include="..\sigc++\connection.cc"><Filter>Source Files</Filter></ClCompile>
1919
<ClCompile Include="..\sigc++\signal.cc"><Filter>Source Files</Filter></ClCompile>
2020
<ClCompile Include="..\sigc++\signal_base.cc"><Filter>Source Files</Filter></ClCompile>
21+
<ClCompile Include="..\sigc++\trackable.cc"><Filter>Source Files</Filter></ClCompile>
22+
<ClCompile Include="..\sigc++\adaptors\lambda\lambda.cc"><Filter>Source Files</Filter></ClCompile>
2123
<ClCompile Include="..\sigc++\functors\slot.cc"><Filter>Source Files</Filter></ClCompile>
2224
<ClCompile Include="..\sigc++\functors\slot_base.cc"><Filter>Source Files</Filter></ClCompile>
23-
<ClCompile Include="..\sigc++\trackable.cc"><Filter>Source Files</Filter></ClCompile>
2425
</ItemGroup>
2526
<ItemGroup>
26-
<ClInclude Include="..\sigc++\adaptors\adaptor_trait.h"><Filter>Header Files</Filter></ClInclude>
27-
<ClInclude Include="..\sigc++\adaptors\adaptors.h"><Filter>Header Files</Filter></ClInclude>
2827
<ClInclude Include="..\sigc++\bind.h"><Filter>Header Files</Filter></ClInclude>
29-
<ClInclude Include="..\sigc++\adaptors\bind.h"><Filter>Header Files</Filter></ClInclude>
30-
<ClInclude Include="..\sigc++\adaptors\bind_return.h"><Filter>Header Files</Filter></ClInclude>
3128
<ClInclude Include="..\sigc++\bind_return.h"><Filter>Header Files</Filter></ClInclude>
3229
<ClInclude Include="..\sigc++\class_slot.h"><Filter>Header Files</Filter></ClInclude>
33-
<ClInclude Include="..\sigc++\adaptors\compose.h"><Filter>Header Files</Filter></ClInclude>
3430
<ClInclude Include="..\sigc++\connection.h"><Filter>Header Files</Filter></ClInclude>
35-
<ClInclude Include="..\sigc++\adaptors\deduce_result_type.h"><Filter>Header Files</Filter></ClInclude>
36-
<ClInclude Include="..\sigc++\adaptors\exception_catch.h"><Filter>Header Files</Filter></ClInclude>
37-
<ClInclude Include="..\sigc++\functors\functor_trait.h"><Filter>Header Files</Filter></ClInclude>
38-
<ClInclude Include="..\sigc++\functors\functors.h"><Filter>Header Files</Filter></ClInclude>
3931
<ClInclude Include="..\sigc++\hide.h"><Filter>Header Files</Filter></ClInclude>
40-
<ClInclude Include="..\sigc++\adaptors\hide.h"><Filter>Header Files</Filter></ClInclude>
41-
<ClInclude Include="..\sigc++\functors\mem_fun.h"><Filter>Header Files</Filter></ClInclude>
32+
<ClInclude Include="..\sigc++\limit_reference.h"><Filter>Header Files</Filter></ClInclude>
4233
<ClInclude Include="..\sigc++\method_slot.h"><Filter>Header Files</Filter></ClInclude>
4334
<ClInclude Include="..\sigc++\object.h"><Filter>Header Files</Filter></ClInclude>
4435
<ClInclude Include="..\sigc++\object_slot.h"><Filter>Header Files</Filter></ClInclude>
45-
<ClInclude Include="..\sigc++\functors\ptr_fun.h"><Filter>Header Files</Filter></ClInclude>
4636
<ClInclude Include="..\sigc++\reference_wrapper.h"><Filter>Header Files</Filter></ClInclude>
47-
<ClInclude Include="..\sigc++\adaptors\retype.h"><Filter>Header Files</Filter></ClInclude>
4837
<ClInclude Include="..\sigc++\retype.h"><Filter>Header Files</Filter></ClInclude>
4938
<ClInclude Include="..\sigc++\retype_return.h"><Filter>Header Files</Filter></ClInclude>
50-
<ClInclude Include="..\sigc++\adaptors\retype_return.h"><Filter>Header Files</Filter></ClInclude>
5139
<ClInclude Include="..\sigc++\sigc++.h"><Filter>Header Files</Filter></ClInclude>
5240
<ClInclude Include="..\sigc++\signal.h"><Filter>Header Files</Filter></ClInclude>
5341
<ClInclude Include="..\sigc++\signal_base.h"><Filter>Header Files</Filter></ClInclude>
54-
<ClInclude Include="..\sigc++\functors\slot.h"><Filter>Header Files</Filter></ClInclude>
5542
<ClInclude Include="..\sigc++\slot.h"><Filter>Header Files</Filter></ClInclude>
56-
<ClInclude Include="..\sigc++\functors\slot_base.h"><Filter>Header Files</Filter></ClInclude>
5743
<ClInclude Include="..\sigc++\trackable.h"><Filter>Header Files</Filter></ClInclude>
5844
<ClInclude Include="..\sigc++\type_traits.h"><Filter>Header Files</Filter></ClInclude>
5945
<ClInclude Include="..\sigc++\visit_each.h"><Filter>Header Files</Filter></ClInclude>
60-
<ClInclude Include="..\sigc++\limit_reference.h"><Filter>Header Files</Filter></ClInclude>
46+
<ClInclude Include="..\sigc++\adaptors\adaptor_trait.h"><Filter>Header Files</Filter></ClInclude>
47+
<ClInclude Include="..\sigc++\adaptors\adaptors.h"><Filter>Header Files</Filter></ClInclude>
48+
<ClInclude Include="..\sigc++\adaptors\bind.h"><Filter>Header Files</Filter></ClInclude>
49+
<ClInclude Include="..\sigc++\adaptors\bind_return.h"><Filter>Header Files</Filter></ClInclude>
6150
<ClInclude Include="..\sigc++\adaptors\bound_argument.h"><Filter>Header Files</Filter></ClInclude>
51+
<ClInclude Include="..\sigc++\adaptors\compose.h"><Filter>Header Files</Filter></ClInclude>
52+
<ClInclude Include="..\sigc++\adaptors\deduce_result_type.h"><Filter>Header Files</Filter></ClInclude>
53+
<ClInclude Include="..\sigc++\adaptors\exception_catch.h"><Filter>Header Files</Filter></ClInclude>
54+
<ClInclude Include="..\sigc++\adaptors\hide.h"><Filter>Header Files</Filter></ClInclude>
55+
<ClInclude Include="..\sigc++\adaptors\retype.h"><Filter>Header Files</Filter></ClInclude>
56+
<ClInclude Include="..\sigc++\adaptors\retype_return.h"><Filter>Header Files</Filter></ClInclude>
6257
<ClInclude Include="..\sigc++\adaptors\track_obj.h"><Filter>Header Files</Filter></ClInclude>
58+
<ClInclude Include="..\sigc++\adaptors\lamdba\base.h"><Filter>Header Files</Filter></ClInclude>
59+
<ClInclude Include="..\sigc++\adaptors\lamdba\select.h"><Filter>Header Files</Filter></ClInclude>
60+
<ClInclude Include="..\sigc++\functors\functor_trait.h"><Filter>Header Files</Filter></ClInclude>
61+
<ClInclude Include="..\sigc++\functors\functors.h"><Filter>Header Files</Filter></ClInclude>
62+
<ClInclude Include="..\sigc++\functors\mem_fun.h"><Filter>Header Files</Filter></ClInclude>
63+
<ClInclude Include="..\sigc++\functors\ptr_fun.h"><Filter>Header Files</Filter></ClInclude>
64+
<ClInclude Include="..\sigc++\functors\slot.h"><Filter>Header Files</Filter></ClInclude>
65+
<ClInclude Include="..\sigc++\functors\slot_base.h"><Filter>Header Files</Filter></ClInclude>
6366
</ItemGroup>
6467
<ItemGroup>
6568
<ResourceCompile Include="sigc.rc"><Filter>Resource Files</Filter></ResourceCompile>

‎MSVC_Net2013/sigc-install.props

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ copy ".\sigc++config.h" "$(CopyDir)\lib\sigc++-$(ApiMajorVersion).$(ApiMinorVers
2121
if "$(Configuration)" == "Release" copy "$(BinDir)\sigc$(ReleaseDllSuffix).lib" "$(CopyDir)\lib"
2222
if "$(Configuration)" == "Debug" copy "$(BinDir)\sigc$(DebugDllSuffix).lib" "$(CopyDir)\lib"
2323

24-
mkdir "$(CopyDir)\include\sigc++-$(ApiMajorVersion).$(ApiMinorVersion)\sigc++\adaptors"
24+
mkdir "$(CopyDir)\include\sigc++-$(ApiMajorVersion).$(ApiMinorVersion)\sigc++\adaptors\lambda"
2525
mkdir "$(CopyDir)\include\sigc++-$(ApiMajorVersion).$(ApiMinorVersion)\sigc++\functors"
2626

2727
copy "..\sigc++\sigc++.h" "$(CopyDir)\include\sigc++-$(ApiMajorVersion).$(ApiMinorVersion)\sigc++\"
@@ -50,6 +50,8 @@ copy "..\sigc++\adaptors\hide.h" "$(CopyDir)\include\sigc++-$(ApiMajorVersion).$
5050
copy "..\sigc++\adaptors\retype.h" "$(CopyDir)\include\sigc++-$(ApiMajorVersion).$(ApiMinorVersion)\sigc++\adaptors\"
5151
copy "..\sigc++\adaptors\retype_return.h" "$(CopyDir)\include\sigc++-$(ApiMajorVersion).$(ApiMinorVersion)\sigc++\adaptors\"
5252
copy "..\sigc++\adaptors\track_obj.h" "$(CopyDir)\include\sigc++-$(ApiMajorVersion).$(ApiMinorVersion)\sigc++\adaptors\"
53+
copy "..\sigc++\adaptors\lambda\base.h" "$(CopyDir)\include\sigc++-$(ApiMajorVersion).$(ApiMinorVersion)\sigc++\adaptors\lambda"
54+
copy "..\sigc++\adaptors\lambda\select.h" "$(CopyDir)\include\sigc++-$(ApiMajorVersion).$(ApiMinorVersion)\sigc++\adaptors\lambda"
5355
copy "..\sigc++\functors\functors.h" "$(CopyDir)\include\sigc++-$(ApiMajorVersion).$(ApiMinorVersion)\sigc++\functors\"
5456
copy "..\sigc++\functors\functor_trait.h" "$(CopyDir)\include\sigc++-$(ApiMajorVersion).$(ApiMinorVersion)\sigc++\functors\"
5557
copy "..\sigc++\functors\mem_fun.h" "$(CopyDir)\include\sigc++-$(ApiMajorVersion).$(ApiMinorVersion)\sigc++\functors\"

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy