Skip to content

Commit 57d9a05

Browse files
ThePhDThePhD
committed
🎨 Refactor tutorial examples
- 🛠 Make sure the tutorials compile across platforms! - ✍ Redo quite a bit of the documentation
1 parent 8618e39 commit 57d9a05

460 files changed

Lines changed: 2482 additions & 1490 deletions

File tree

Some content is hidden

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

‎.clang-format‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# # # # sol3
1+
# # # # sol2
22
# The MIT License (MIT)
33
#
44
# Copyright (c) 2013-2021 Rapptz, ThePhD, and contributors

‎.dockerignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# # # # sol3
1+
# # # # sol2
22
# The MIT License (MIT)
33
#
44
# Copyright (c) 2013-2021 Rapptz, ThePhD, and contributors

‎.gitignore‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# # # # sol3
1+
# # # # sol2
22
# The MIT License (MIT)
33
#
44
# Copyright (c) 2013-2021 Rapptz, ThePhD, and contributors
@@ -46,6 +46,10 @@ x86/
4646
# VSCode
4747
.vscode/
4848

49+
# scratch space
50+
main.cpp
51+
scratch/
52+
4953
# CMake
5054
build/
5155
build-sol2/
@@ -109,7 +113,6 @@ desktop.ini
109113

110114
# Miscellaneous
111115
external/
112-
scratch/
113116
vendor/
114117
.idea/
115118
cmake-build-debug/

‎.travis.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# # # # sol3
1+
# # # # sol2
22
# The MIT License (MIT)
33
#
44
# Copyright (c) 2013-2021 Rapptz, ThePhD, and contributors

‎CMakeLists.txt‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# # # # sol3
1+
# # # # sol2
22
# The MIT License (MIT)
33
#
44
# Copyright (c) 2013-2021 Rapptz, ThePhD, and contributors
@@ -20,7 +20,7 @@
2020
# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
2121
# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
2222

23-
# # # # sol3
23+
# # # # sol2
2424
# # # Required minimum version statement
2525
cmake_minimum_required(VERSION 3.15.0)
2626

@@ -311,4 +311,11 @@ if (SOL2_IS_TOP_LEVEL AND (SOL2_DO_TESTS OR SOL2_DO_EXAMPLES))
311311
message(STATUS "sol2 adding tests...")
312312
add_subdirectory(tests "${CMAKE_BINARY_DIR}/tests")
313313
endif()
314+
315+
# # # Scratch Space
316+
# # Scratch space for diagnosing bugs and other shenanigans
317+
if (SOL2_SCRATCH)
318+
message(STATUS "sol2 adding scratch space...")
319+
add_subdirectory(scratch)
320+
endif()
314321
endif()

‎CONTRIBUTORS.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# 🎉 Donators! ♥ 🎉
22

3-
Thank you to all patrons, donators and contributors who help keep sol3 amazing.
3+
Thank you to all patrons, donators and contributors who help keep sol2 amazing.
44

55
- Robert Salvet
66
- Ορφέας Ζαφείρης - 2x Donations!
@@ -12,7 +12,7 @@ Thank you to all patrons, donators and contributors who help keep sol3 amazing.
1212

1313
# 🎉 Patrons! ♥ 🎉
1414

15-
Beyond just a one-time donation, patrons make a continued commitment to help keep sol3 supported and bug-free. Thank you for your patronage! Here are the supporters that wanted to be featured as sol3 contributors.
15+
Beyond just a one-time donation, patrons make a continued commitment to help keep sol2 supported and bug-free. Thank you for your patronage! Here are the supporters that wanted to be featured as sol2 contributors.
1616

1717
- Joel Falcou
1818
- Michael Caisse
@@ -22,6 +22,6 @@ Beyond just a one-time donation, patrons make a continued commitment to help kee
2222

2323
# Company Patrons / Supporters #
2424

25-
Companies who sign up for a long-term support contract or patronage are listed here! They really push forward what's possible with sol3 (and the newer v3)! Please reach out to [email protected] if you are interested in a custom solution or a long-term support contract that goes beyond the current release's needs!
25+
Companies who sign up for a long-term support contract or patronage are listed here! They really push forward what's possible with sol2 (and the newer v3)! Please reach out to [email protected] if you are interested in a custom solution or a long-term support contract that goes beyond the current release's needs!
2626

2727
- Intrepid Control Systems [intrepidcs.com](https://www.intrepidcs.com/)

‎Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# # # # sol3
1+
# # # # sol2
22
# The MIT License (MIT)
33
#
44
# Copyright (c) 2013-2017 Rapptz, ThePhD, and contributors

‎README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ You can find [donation and sponorship options here](https://github.com/ThePhD/.g
6565
6666
# Features
6767
68-
- [Fastest in the land](http://sol2.readthedocs.io/en/latest/benchmarks.html) (see: sol3 bar in graph).
68+
- [Fastest in the land](http://sol2.readthedocs.io/en/latest/benchmarks.html) (see: sol2 bar in graph).
6969
- Supports retrieval and setting of multiple types including:
7070
* `std::string`, `std::wstring`, `std::u16string` and `std::u32string` support (and for views).
7171
* understands and works with containers such as `std::map/unordered_map`, c-style arrays, vectors, non-standard custom containers and more.
@@ -98,7 +98,7 @@ Please make sure you use the `-std=c++2a`, `-std=c++1z`, `-std=c++17` or better
9898
9999
If you would like support for an older compiler (at the cost of some features), use the latest tagged sol2 branch. If you would like support for an even older compiler, feel free to contact me for a Custom Solution.
100100
101-
sol3 is checked by-hand for other platforms as well, including Android-based builds with GCC and iOS-based builds out of XCode with Apple-clang. It should work on both of these platforms, so long as you have the proper standards flags. If something doesn't work or you need special options, you may need to look into the different ways to support the project to have it done for you!
101+
sol2 is checked by-hand for other platforms as well, including Android-based builds with GCC and iOS-based builds out of XCode with Apple-clang. It should work on both of these platforms, so long as you have the proper standards flags. If something doesn't work or you need special options, you may need to look into the different ways to support the project to have it done for you!
102102
103103
104104
@@ -141,7 +141,7 @@ ThePhD
141141
C++Now 2018 - Hudson Commons, Aspen Physics Center, Aspen, Colorado
142142
[Deck](https://github.com/ThePhD/sol2/blob/develop/docs/presentations/2018.05.10%20-%20ThePhD%20-%20Compile%20Fast%2C%20Run%20Faster%2C%20Scale%20Forever.pdf)
143143
144-
"Scripting at the Speed of Thought: Using Lua in C++ with sol3"
144+
"Scripting at the Speed of Thought: Using Lua in C++ with sol2"
145145
ThePhD
146146
CppCon 2018 - 404 Keystone, Meydenbauer Center, Aspen, Colorado
147147
[Deck](https://github.com/ThePhD/sol2/blob/develop/docs/presentations/2018.09.28%20-%20ThePhD%20-%20Scripting%20at%20the%20Speed%20of%20Thought.pdf)

‎appveyor.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# # # # sol3
1+
# # # # sol2
22
# The MIT License (MIT)
33
#
44
# Copyright (c) 2013-2021 Rapptz, ThePhD, and contributors

‎cmake/Modules/Common/Core.cmake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# # # # sol3
1+
# # # # sol2
22
# The MIT License (MIT)
33
#
44
# Copyright (c) 2013-2021 Rapptz, ThePhD, and contributors

0 commit comments

Comments
 (0)