Skip to content

Commit a57871e

Browse files
committed
StringView: use string-view-lite implementation
https://github.com/martinmoene/string-view-lite * Add char_type hack for fmtlib to work in Player * Add helper free functions * Add install rules in lcf/third_party/string_view.hpp
1 parent eadcda0 commit a57871e

File tree

4 files changed

+1584
-299
lines changed

4 files changed

+1584
-299
lines changed

CMakeLists.txt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -283,6 +283,7 @@ set(LCF_HEADERS
283283
src/generated/lcf/rpg/trooppage.h
284284
src/generated/lcf/rpg/trooppagecondition.h
285285
src/generated/lcf/rpg/variable.h
286+
src/lcf/third_party/string_view.hpp
286287
)
287288

288289
list(TRANSFORM LCF_SOURCES PREPEND ${CMAKE_CURRENT_SOURCE_DIR}/)
@@ -292,7 +293,7 @@ list(APPEND LCF_HEADERS ${CMAKE_CURRENT_BINARY_DIR}/src/lcf/config.h)
292293
target_sources(lcf PRIVATE ${LCF_SOURCES} PUBLIC ${LCF_HEADERS})
293294

294295
# IDE source grouping
295-
foreach(SG LDB LMT LMU LSD RPG)
296+
foreach(SG LDB LMT LMU LSD RPG THIRD_PARTY)
296297
string(TOLOWER ${SG} LSG)
297298
source_group("Source Files\\generated\\${SG}" REGULAR_EXPRESSION "generated/${LSG}_.*\\.cpp")
298299
source_group("Header Files\\generated\\${SG}" REGULAR_EXPRESSION "generated/lcf/${LSG}/.*\\.h")
@@ -389,7 +390,7 @@ install(
389390
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
390391

391392
set(LCF_INSTALL_HEADERS ${LCF_HEADERS})
392-
foreach(S ldb lmt lmu lsd rpg)
393+
foreach(S ldb lmt lmu lsd rpg third_party)
393394
set(SUBDIR_HEADERS ${LCF_INSTALL_HEADERS})
394395
list(FILTER SUBDIR_HEADERS INCLUDE REGEX "/${S}/")
395396
install(FILES ${SUBDIR_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/lcf/${S})

Makefile.am

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ lcflmtincludedir = $(includedir)/lcf/lmt
2121
lcflmuincludedir = $(includedir)/lcf/lmu
2222
lcflsdincludedir = $(includedir)/lcf/lsd
2323
lcfrpgincludedir = $(includedir)/lcf/rpg
24+
lcfthirdpartyincludedir = $(includedir)/lcf/third_party
2425

2526
lib_LTLIBRARIES = liblcf.la
2627
liblcf_la_CPPFLAGS = \
@@ -300,6 +301,9 @@ lcfrpginclude_HEADERS = \
300301
src/generated/lcf/rpg/trooppagecondition.h \
301302
src/generated/lcf/rpg/variable.h
302303

304+
lcfthirdpartyinclude_HEADERS = \
305+
src/lcf/third_party/string_view.hpp
306+
303307
nodist_lcfinclude_HEADERS = autogen/lcf/config.h
304308

305309
check_PROGRAMS = test_runner

0 commit comments

Comments
 (0)