Skip to content

Commit 6a17a1d

Browse files
committed
Replace slot_map submodule and integrate files directly.
1 parent fd32cfd commit 6a17a1d

File tree

6 files changed

+1772
-5
lines changed

6 files changed

+1772
-5
lines changed

.gitmodules

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,3 @@
2121
[submodule "lib/mnsg"]
2222
path = lib/mnsg
2323
url = https://github.com/klorfmorf/mnsg
24-
[submodule "lib/slot_map"]
25-
path = lib/slot_map
26-
url = https://github.com/SergeyMakeev/slot_map.git

CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,7 @@ set (SOURCES
163163
${CMAKE_SOURCE_DIR}/src/game/recomp_api.cpp
164164
${CMAKE_SOURCE_DIR}/src/game/recomp_actor_api.cpp
165165
${CMAKE_SOURCE_DIR}/src/game/recomp_data_api.cpp
166+
${CMAKE_SOURCE_DIR}/src/game/rom_decompression.cpp
166167
${CMAKE_SOURCE_DIR}/src/game/tlb.cpp
167168
${CMAKE_SOURCE_DIR}/src/game/unknown_symbols.cpp
168169

@@ -222,7 +223,7 @@ target_include_directories(Goemon64Recompiled PRIVATE
222223
${CMAKE_SOURCE_DIR}/lib/rt64/src/render
223224
${CMAKE_SOURCE_DIR}/lib/freetype-windows-binaries/include
224225
${CMAKE_SOURCE_DIR}/lib/rt64/src/contrib/nativefiledialog-extended/src/include
225-
${CMAKE_SOURCE_DIR}/lib/slot_map/slot_map
226+
${CMAKE_SOURCE_DIR}/lib/SlotMap
226227
${CMAKE_BINARY_DIR}/shaders
227228
${CMAKE_CURRENT_BINARY_DIR}
228229
)

lib/SlotMap/LICENSE

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
MIT License
2+
3+
Copyright (c) 2022 Sergey Makeev
4+
5+
Permission is hereby granted, free of charge, to any person obtaining a copy
6+
of this software and associated documentation files (the "Software"), to deal
7+
in the Software without restriction, including without limitation the rights
8+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9+
copies of the Software, and to permit persons to whom the Software is
10+
furnished to do so, subject to the following conditions:
11+
12+
The above copyright notice and this permission notice shall be included in all
13+
copies or substantial portions of the Software.
14+
15+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21+
SOFTWARE.

0 commit comments

Comments
 (0)