Skip to content
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

Jump to bottom

Listing captions #240

Merged
merged 6 commits into from
Oct 28, 2019
Merged

Listing captions #240

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
53a09f6
Add listing captions
Oct 25, 2019
354ae8b
Update style CSS for listing captions
hollasch Oct 26, 2019
31d9ed4
Revert "Delete bogus files from src/theRestOfYourLife"
hollasch Oct 26, 2019
d2dbd5c
Alt program renames, updates
hollasch Oct 26, 2019
a23d475
Update alt programs and setup build
hollasch Oct 26, 2019
03f0384
Update alt programs + book to match
hollasch Oct 26, 2019
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
34 changes: 24 additions & 10 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,13 @@ project ( RTWeekend
set ( CMAKE_CXX_STANDARD 11 )

# Source
set ( SOURCE_ONE_WEEKEND
set ( COMMON_ALL
src/common/rtweekend.h
src/common/vec3.h
)

set ( SOURCE_ONE_WEEKEND
${COMMON_ALL}
src/InOneWeekend/camera.h
src/InOneWeekend/hittable.h
src/InOneWeekend/hittable_list.h
Expand All @@ -28,9 +32,8 @@ set ( SOURCE_ONE_WEEKEND
)

set ( SOURCE_NEXT_WEEK
src/common/rtweekend.h
${COMMON_ALL}
src/common/rtw_stb_image.h
src/common/vec3.h
src/common/external/stb_image.h
src/TheNextWeek/aabb.h
src/TheNextWeek/aarect.h
Expand All @@ -51,13 +54,13 @@ set ( SOURCE_NEXT_WEEK
)

set ( SOURCE_REST_OF_YOUR_LIFE
src/common/rtweekend.h
${COMMON_ALL}
src/common/rtw_stb_image.h
src/common/vec3.h
src/common/external/stb_image.h
src/TheRestOfYourLife/aabb.h
src/TheRestOfYourLife/aarect.h
src/TheRestOfYourLife/box.h
src/TheRestOfYourLife/bucamera.h
src/TheRestOfYourLife/bvh.h
src/TheRestOfYourLife/camera.h
src/TheRestOfYourLife/constant_medium.h
Expand All @@ -75,12 +78,23 @@ set ( SOURCE_REST_OF_YOUR_LIFE
src/TheRestOfYourLife/main.cc
)

set ( COMMON_DIR src )

# Executables
add_executable(inOneWeekend ${SOURCE_ONE_WEEKEND})
add_executable(theNextWeek ${SOURCE_NEXT_WEEK})
add_executable(theRestOfYourLife ${SOURCE_REST_OF_YOUR_LIFE})
add_executable(cos_cubed src/TheRestOfYourLife/cos_cubed.cc ${COMMON_ALL})
add_executable(cos_density src/TheRestOfYourLife/cos_density.cc ${COMMON_ALL})
add_executable(integrate_x_sq src/TheRestOfYourLife/integrate_x_sq.cc ${COMMON_ALL})
add_executable(pi src/TheRestOfYourLife/pi.cc ${COMMON_ALL})
add_executable(sphere_importance src/TheRestOfYourLife/sphere_importance.cc ${COMMON_ALL})
add_executable(sphere_plot src/TheRestOfYourLife/sphere_plot.cc ${COMMON_ALL})

target_include_directories(inOneWeekend PRIVATE ${COMMON_DIR})
target_include_directories(theNextWeek PRIVATE ${COMMON_DIR})
target_include_directories(theRestOfYourLife PRIVATE ${COMMON_DIR})
target_include_directories(inOneWeekend PRIVATE src)
target_include_directories(theNextWeek PRIVATE src)
target_include_directories(theRestOfYourLife PRIVATE src)
target_include_directories(cos_cubed PRIVATE src)
target_include_directories(cos_density PRIVATE src)
target_include_directories(integrate_x_sq PRIVATE src)
target_include_directories(pi PRIVATE src)
target_include_directories(sphere_importance PRIVATE src)
target_include_directories(sphere_plot PRIVATE src)
Loading