Skip to content

Commit e35f3bf

Browse files
committed
fgd: wip unfinished impl with toolpp
this actually crashes the editor currently if you try to load an FGD :(
1 parent d0fee4b commit e35f3bf

File tree

3 files changed

+812
-2
lines changed

3 files changed

+812
-2
lines changed

CMakeLists.txt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ add_executable(radiant WIN32
186186
${PROJECT_SOURCE_DIR}/radiant/dialog.cpp
187187
${PROJECT_SOURCE_DIR}/radiant/eclass_def.cpp
188188
${PROJECT_SOURCE_DIR}/radiant/eclass_doom3.cpp
189-
${PROJECT_SOURCE_DIR}/radiant/eclass_fgd.cpp
189+
${PROJECT_SOURCE_DIR}/radiant/eclass_fgd_sourcepp.cpp
190190
${PROJECT_SOURCE_DIR}/radiant/eclass.cpp
191191
${PROJECT_SOURCE_DIR}/radiant/eclass_xml.cpp
192192
${PROJECT_SOURCE_DIR}/radiant/entityinspector.cpp
@@ -272,6 +272,7 @@ target_include_directories(radiant PRIVATE
272272
target_link_libraries(radiant PRIVATE Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Svg)
273273
target_link_libraries(radiant PRIVATE LibXml2::LibXml2)
274274
target_link_libraries(radiant PRIVATE commandlib gtkutil l_net xmllib quickhull)
275+
target_link_libraries(radiant PRIVATE sourcepp::toolpp)
275276
if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
276277
target_link_libraries(radiant PRIVATE ws2_32)
277278
endif()
@@ -280,7 +281,7 @@ set_target_properties(radiant commandlib gtkutil xmllib PROPERTIES CXX_STANDARD_
280281

281282
if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
282283
target_compile_options(radiant PRIVATE -MMD -W -Wall -Wcast-align -Wcast-qual -Wno-unused-parameter -Wno-unused-function -fno-strict-aliasing)
283-
target_compile_options(radiant PRIVATE -Wreorder -fno-exceptions -fno-rtti -fpermissive)
284+
target_compile_options(radiant PRIVATE -Wreorder -fno-rtti -fpermissive)
284285
endif()
285286

286287
set_target_properties(radiant

0 commit comments

Comments
 (0)