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

fix compiler errors & embree miss #1

Merged
merged 5 commits into from
Feb 27, 2023
Merged

fix compiler errors & embree miss #1

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
daee579
fix constant error
mchenwang Feb 27, 2023
0a2651d
fix std::max/min error
mchenwang Feb 27, 2023
63a69a2
fix utf-8 warring
mchenwang Feb 27, 2023
2263a0a
fix embree3 miss
mchenwang Feb 27, 2023
2561672
fix tbb miss
mchenwang Feb 27, 2023
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
Prev Previous commit
Next Next commit
fix utf-8 warring
  • Loading branch information
@mchenwang
mchenwang committed Feb 27, 2023
commit 63a69a2d1931ffe3fc3bb12cb5dd0e70f137a713
76 changes: 45 additions & 31 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,55 +5,69 @@ set(CMAKE_EXPORT_COMPILE_COMMANDS ON)

project(Moer-lite LANGUAGES CXX)

if(MSVC)
add_compile_options("/MP")
add_compile_options("$<$<C_COMPILER_ID:MSVC>:/utf-8>")
add_compile_options("$<$<CXX_COMPILER_ID:MSVC>:/utf-8>")
endif(MSVC)

if(WIN32)
add_definitions(-DUNICODE -D_UNICODE)
add_definitions(-DNOMINMAX)
endif()

set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_SOURCE_DIR}/target/lib)
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PROJECT_SOURCE_DIR}/target/lib)
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_SOURCE_DIR}/target/bin)

add_subdirectory(./externals)

add_executable(Moer
src/main.cpp

src/CoreLayer/Math/Transform.cpp

src/FunctionLayer/Acceleration/EmbreeBVH.cpp
src/FunctionLayer/Integrator/NormalIntegrator.cpp
src/FunctionLayer/Integrator/DirectIntegrator.cpp
src/FunctionLayer/Camera/Camera.cpp
src/FunctionLayer/Camera/Pinhole.cpp
src/FunctionLayer/Scene/Scene.cpp
src/FunctionLayer/Light/SpotLight.cpp
src/FunctionLayer/Light/AreaLight.cpp
src/FunctionLayer/Light/EnvironmentLight.cpp
src/FunctionLayer/Shape/Shape.cpp
src/FunctionLayer/Shape/Triangle.cpp
src/FunctionLayer/Shape/Sphere.cpp
src/FunctionLayer/Shape/Parallelogram.cpp
src/FunctionLayer/Texture/NormalTexture.cpp
src/FunctionLayer/Texture/ImageTexture.cpp
src/FunctionLayer/Texture/Texture.cpp
src/FunctionLayer/Texture/Mipmap.cpp
src/FunctionLayer/Material/Matte.cpp
src/FunctionLayer/Material/Material.cpp
src/FunctionLayer/Sampler/IndependentSampler.cpp
src/ResourceLayer/Image.cpp
src/ResourceLayer/Mesh.cpp
src/ResourceLayer/FileUtil.cpp
add_executable(Moer
src/main.cpp

src/CoreLayer/Math/Transform.cpp

src/FunctionLayer/Acceleration/EmbreeBVH.cpp
src/FunctionLayer/Integrator/NormalIntegrator.cpp
src/FunctionLayer/Integrator/DirectIntegrator.cpp
src/FunctionLayer/Camera/Camera.cpp
src/FunctionLayer/Camera/Pinhole.cpp
src/FunctionLayer/Scene/Scene.cpp
src/FunctionLayer/Light/SpotLight.cpp
src/FunctionLayer/Light/AreaLight.cpp
src/FunctionLayer/Light/EnvironmentLight.cpp
src/FunctionLayer/Shape/Shape.cpp
src/FunctionLayer/Shape/Triangle.cpp
src/FunctionLayer/Shape/Sphere.cpp
src/FunctionLayer/Shape/Parallelogram.cpp
src/FunctionLayer/Texture/NormalTexture.cpp
src/FunctionLayer/Texture/ImageTexture.cpp
src/FunctionLayer/Texture/Texture.cpp
src/FunctionLayer/Texture/Mipmap.cpp
src/FunctionLayer/Material/Matte.cpp
src/FunctionLayer/Material/Material.cpp
src/FunctionLayer/Sampler/IndependentSampler.cpp
src/ResourceLayer/Image.cpp
src/ResourceLayer/Mesh.cpp
src/ResourceLayer/FileUtil.cpp
)

target_include_directories(Moer PUBLIC ./externals)
target_include_directories(Moer PUBLIC ./src)
target_include_directories(Moer PUBLIC ./externals/json/include)
target_include_directories(Moer PUBLIC ./externals/embree/include)

if (WIN32)
if(WIN32)
target_link_directories(Moer PUBLIC ${PROJECT_SOURCE_DIR}/libs/win)
endif()
if (UNIX AND NOT APPLE)

if(UNIX AND NOT APPLE)
target_link_directories(Moer PUBLIC ${PROJECT_SOURCE_DIR}/libs/linux)
endif()
if (APPLE)

if(APPLE)
target_link_directories(Moer PUBLIC ${PROJECT_SOURCE_DIR}/libs/macos)
endif()

target_link_directories(Moer PUBLIC ${PROJECT_SOURCE_DIR}/target/lib)
target_link_libraries(Moer embree3 tinyobjloader)