@@ -54,7 +54,6 @@ if (MSVC)
54
54
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /D_CRT_SECURE_NO_WARNINGS" )
55
55
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP24" )
56
56
else ()
57
- set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fms-extensions" )
58
57
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC" )
59
58
endif ()
60
59
@@ -76,7 +75,6 @@ if (MSVC)
76
75
else ()
77
76
list (APPEND CUDA_NVCC_FLAGS "-Xcompiler=-Wno-float-conversion" )
78
77
list (APPEND CUDA_NVCC_FLAGS "-Xcompiler=-fno-strict-aliasing" )
79
- list (APPEND CUDA_NVCC_FLAGS "-Xcompiler=-fms-extensions" )
80
78
list (APPEND CUDA_NVCC_FLAGS "-Xcompiler=-fPIC" )
81
79
endif ()
82
80
list (APPEND CUDA_NVCC_FLAGS "--extended-lambda" )
@@ -203,7 +201,6 @@ endif(NGP_BUILD_WITH_GUI)
203
201
list (APPEND NGP_INCLUDE_DIRECTORIES
204
202
"dependencies"
205
203
"dependencies/filesystem"
206
- "dependencies/glm"
207
204
"dependencies/nanovdb"
208
205
"dependencies/NaturalSort"
209
206
"dependencies/tinylogger"
@@ -261,8 +258,7 @@ endif()
261
258
list (APPEND NGP_SOURCES
262
259
${GUI_SOURCES}
263
260
src/camera_path.cu
264
- src/common.cu
265
- src/common_device.cu
261
+ src/common_host.cu
266
262
src/marching_cubes.cu
267
263
src/nerf_loader.cu
268
264
src/render_buffer.cu
@@ -273,7 +269,7 @@ list(APPEND NGP_SOURCES
273
269
src/testbed_volume.cu
274
270
src/thread_pool.cpp
275
271
src/tinyexr_wrapper.cu
276
- src/tinyobj_loader_wrapper.cpp
272
+ src/tinyobj_loader_wrapper.cu
277
273
src/triangle_bvh.cu
278
274
)
279
275
@@ -284,6 +280,8 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_MINSIZEREL ${CMAKE_BINARY_DIR})
284
280
set (CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG ${CMAKE_BINARY_DIR} )
285
281
286
282
get_filename_component (CUDA_COMPILER_BIN "${CMAKE_CUDA_COMPILER} " DIRECTORY )
283
+ get_filename_component (CUDA_DIR "${CUDA_COMPILER_BIN} " DIRECTORY )
284
+ set (CUDA_INCLUDE "${CUDA_DIR} /include" )
287
285
288
286
if (NGP_OPTIX)
289
287
add_library (optix_program OBJECT
0 commit comments