Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge pull request #8765 from AdmiralCurtiss/jit-reuse-memory
Jit64 codegen space reuse.
  • Loading branch information
JMC47 committed Sep 9, 2020
2 parents 67761c7 + 306a5e6 commit a31c204
Show file tree
Hide file tree
Showing 21 changed files with 1,235 additions and 30 deletions.
2 changes: 2 additions & 0 deletions CMakeLists.txt
Expand Up @@ -803,6 +803,8 @@ endif()

include_directories(Externals/picojson)

add_subdirectory(Externals/rangeset)

########################################
# Pre-build events: Define configuration variables and write SCM info header
#
Expand Down
2 changes: 2 additions & 0 deletions Externals/licenses.md
Expand Up @@ -56,6 +56,8 @@ Dolphin includes or links code of the following third-party software projects:
[LGPLv2.1+](http://cgit.freedesktop.org/pulseaudio/pulseaudio/tree/LICENSE)
- [Qt5](http://qt-project.org/):
[LGPLv3 and other licenses](http://doc.qt.io/qt-5/licensing.html)
- [rangeset](https://github.com/AdmiralCurtiss/rangeset)
[zlib license](https://github.com/AdmiralCurtiss/rangeset/blob/master/LICENSE)
- [SDL](https://www.libsdl.org/):
[zlib license](http://hg.libsdl.org/SDL/file/tip/COPYING.txt)
- [SFML](http://www.sfml-dev.org/):
Expand Down
4 changes: 4 additions & 0 deletions Externals/rangeset/CMakeLists.txt
@@ -0,0 +1,4 @@
add_library(RangeSet::RangeSet INTERFACE IMPORTED GLOBAL)
set_target_properties(RangeSet::RangeSet PROPERTIES
INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_CURRENT_LIST_DIR}/include
)
17 changes: 17 additions & 0 deletions Externals/rangeset/LICENSE
@@ -0,0 +1,17 @@
Copyright (c) 2020 Admiral H. Curtiss

This software is provided 'as-is', without any express or implied
warranty. In no event will the authors be held liable for any damages
arising from the use of this software.

Permission is granted to anyone to use this software for any purpose,
including commercial applications, and to alter it and redistribute it
freely, subject to the following restrictions:

1. The origin of this software must not be misrepresented; you must not
claim that you wrote the original software. If you use this software
in a product, an acknowledgment in the product documentation would be
appreciated but is not required.
2. Altered source versions must be plainly marked as such, and must not be
misrepresented as being the original software.
3. This notice may not be removed or altered from any source distribution.

0 comments on commit a31c204

Please sign in to comment.