Skip to content

Commit

Permalink
👷 Added compile options, identation
Browse files Browse the repository at this point in the history
  • Loading branch information
zschzen committed Jul 30, 2024
1 parent 5f9fbab commit ee124ad
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 5 deletions.
10 changes: 10 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
# EditorConfig is awesome: https://EditorConfig.org

# top-most EditorConfig file
root = true

# Unix-style newlines with a newline ending every file
[*]
end_of_line = lf
insert_final_newline = true
charset = utf-8
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ include(BuildOptions)
# Compiler Settings
# --------------------------------------------------------------------
set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
set(CMAKE_CXX_STANDARD 23)
set(CMAKE_CXX_STANDARD 20)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_CXX_EXTENSIONS OFF)

Expand Down
1 change: 0 additions & 1 deletion CMakeOptions.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ enum_option(OPENGL_VERSION "Auto;4.3;3.3;2.1;1.1;ES 2.0;ES 3.0" "Force a specifi
# Configuration Options
#--------------------------------------------------------------------
option(LUGL_BUILD_TESTBED "Build the LuGL testbed" ${LUGL_IS_MAIN})
option(LUGL_VENDORED "Use vendored libraries" ON)
option(LUGL_BUILD_UNIT_TESTS "Build the LuGL unit tests" ON)

#--------------------------------------------------------------------
Expand Down
16 changes: 13 additions & 3 deletions testbed/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
set(TESTBED_SOURCE_FILES ./main.cpp)
set(TESTBED_SOURCE_FILES ./main.cpp ./Application.cpp)

set(TESTBED_HEADER_FILES)
set(TESTBED_HEADER_FILES ./Application.hpp)

add_executable(testbed)
target_sources(testbed PRIVATE ${TESTBED_SOURCE_FILES} ${TESTBED_HEADER_FILES})
Expand All @@ -15,7 +15,17 @@ set_target_properties(
CXX_EXTENSIONS NO)

if(EMSCRIPTEN)
set_target_properties(testbed PROPERTIES SUFFIX ".html")
set_target_properties(
testbed
PROPERTIES
LINK_FLAGS
"--emrun
WASM=1 -s
ASYNCIFY -s
GL_ENABLE_GET_PROC_ADDRESS=1 -s
ALLOW_MEMORY_GROWTH")
target_link_options(testbed PRIVATE -sNO_DISABLE_EXCEPTION_CATCHING)
target_compile_options(testbed PRIVATE -sNO_DISABLE_EXCEPTION_CATCHING)
endif()

source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR} FILES ${TESTBED_SOURCE_FILES}
Expand Down

0 comments on commit ee124ad

Please sign in to comment.