Skip to content

Issue #13 #292

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 11 commits into
base: master
Choose a base branch
from
Open

Issue #13 #292

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
291ddc4
IssueNumber = #5, IssueName = Task 1
XJamesWrightX Mar 20, 2022
55bde53
IssueNumber = #5, IssueName = Task 1
XJamesWrightX Mar 22, 2022
50ec42f
Setup testing & example tests
XJamesWrightX Mar 23, 2022
26259dd
Testing is setup etc
XJamesWrightX Mar 25, 2022
91856d7
Merge pull request #43 from Team-10-But-Better/TestingReady
XarosElite Mar 29, 2022
e2155a5
Updated texture file
DragonTamer9001 Apr 14, 2022
85472e0
Updated item file
DragonTamer9001 Apr 14, 2022
c123839
Added texture numbers
DragonTamer9001 Apr 19, 2022
f106cbe
Added new items to bottom of list
DragonTamer9001 Apr 19, 2022
b96937a
final item update
DragonTamer9001 Apr 19, 2022
8b2b493
Added item count test, proves new items exist
DragonTamer9001 Apr 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,8 @@ log.txt
*.exe
*.dll
*.pyc

html
build
deps
CMakeDoxyfile.in
CMakeDoxygenDefaults.cmake
59 changes: 57 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,61 @@
cmake_minimum_required(VERSION 2.8)
cmake_minimum_required(VERSION 3.16.3)

###############################################################################
set(CMAKE_C_COMPILER /usr/bin/clang)
set(CMAKE_CXX_COMPILER /usr/bin/clang++)
set(CMAKE_CXX_STANDARD 11)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_CXX_EXTENSIONS OFF)
set(CMAKE_CXX_FLAGS "-g -O0 -std=c++11 -U__STRICT_ANSI__ -fprofile-instr-generate -fcoverage-mapping")


project(craft)

FILE(GLOB SOURCE_FILES src/*.c)
include_directories(googletest/include) # this is so we can #include <gtest/gtest.h>
#include_directories(include)

include(FetchContent)
FetchContent_Declare(
googletest
URL https://github.com/google/googletest/archive/609281088cfefc76f9d0ce82e1ff6c30cc3591e5.zip
)
FetchContent_MakeAvailable(googletest)

###############################################################################
add_executable(tests)
target_include_directories(tests PUBLIC model)
target_sources(tests PUBLIC
${SOURCE_FILES}
tests/tests.cpp
src/deleteme.c
deps/glew/src/glew.c
deps/lodepng/lodepng.c
deps/noise/noise.c
deps/sqlite/sqlite3.c
deps/tinycthread/tinycthread.c)

target_link_libraries(tests PRIVATE gtest) # link google test to this executable
set_property(TARGET tests PROPERTY CXX_STANDARD 11)

###############################################################################
add_custom_target(coverage
COMMAND ln -f -s ../textures .
COMMAND ln -f -s ../shaders .
COMMAND ./tests
COMMAND llvm-profdata merge -sparse default.profraw -o cumulative.profdata
COMMAND llvm-cov show -ignore-filename-regex='../google*/*' -format="html" ./tests -instr-profile=cumulative.profdata > coverageLines.html
COMMAND llvm-cov report -show-region-summary=false -ignore-filename-regex='../google*/*' ./tests -instr-profile=cumulative.profdata > coverageSummary.txt
COMMAND cat coverageSummary.txt
COMMAND cd build
)
add_dependencies(coverage tests)


add_executable(
craft
${SOURCE_FILES}
tests/craft_main.c
deps/glew/src/glew.c
deps/lodepng/lodepng.c
deps/noise/noise.c
Expand Down Expand Up @@ -39,11 +88,17 @@ if(APPLE)
endif()

if(UNIX)
target_link_libraries(craft dl glfw
target_link_libraries(craft PUBLIC dl PUBLIC glfw
${GLFW_LIBRARIES} ${CURL_LIBRARIES})
endif()

if(MINGW)
target_link_libraries(craft ws2_32.lib glfw
${GLFW_LIBRARIES} ${CURL_LIBRARIES})
endif()

if(UNIX)
target_link_libraries(tests PUBLIC dl PUBLIC glfw
${GLFW_LIBRARIES} ${CURL_LIBRARIES})
endif()

Loading