mirror of https://github.com/vitalif/openscad
fix broken build
parent
0356c77a2f
commit
c7a809e0fd
|
@ -253,7 +253,7 @@ include_directories(${CGAL_INCLUDE_DIRS})
|
||||||
#
|
#
|
||||||
# cgaltest
|
# cgaltest
|
||||||
#
|
#
|
||||||
add_executable(cgaltest cgaltest.cc ../src/CGAL_Nef_polyhedron.cc ../src/cgalutils.cc ../src/CSGTermEvaluator.cc
|
add_executable(cgaltest cgaltest.cc ../src/CGAL_Nef_polyhedron.cc ../src/cgalutils.cc ../src/CSGTermEvaluator.cc system-gl.cc
|
||||||
../src/CGALEvaluator.cc ../src/CGALCache.cc ../src/PolySetCGALEvaluator.cc ../src/qhash.cc
|
../src/CGALEvaluator.cc ../src/CGALCache.cc ../src/PolySetCGALEvaluator.cc ../src/qhash.cc
|
||||||
../src/CGAL_Nef_polyhedron_DxfData.cc ../src/cgaladv_minkowski2.cc ../src/cgaladv_convexhull2.cc
|
../src/CGAL_Nef_polyhedron_DxfData.cc ../src/cgaladv_minkowski2.cc ../src/cgaladv_convexhull2.cc
|
||||||
${COMMON_SOURCES})
|
${COMMON_SOURCES})
|
||||||
|
@ -263,7 +263,7 @@ target_link_libraries(cgaltest ${CGAL_LIBRARY} ${CGAL_3RD_PARTY_LIBRARIES} ${QT_
|
||||||
#
|
#
|
||||||
# cgalpngtest
|
# cgalpngtest
|
||||||
#
|
#
|
||||||
add_executable(cgalpngtest cgalpngtest.cc OffscreenView.cc bboxhelp.cc ${OFFSCREEN_CTX_SOURCE} imageutils.cc fbo.cc
|
add_executable(cgalpngtest cgalpngtest.cc OffscreenView.cc bboxhelp.cc ${OFFSCREEN_CTX_SOURCE} imageutils.cc fbo.cc system-gl.cc
|
||||||
../src/CGALRenderer.cc ../src/CGAL_Nef_polyhedron.cc ../src/cgalutils.cc
|
../src/CGALRenderer.cc ../src/CGAL_Nef_polyhedron.cc ../src/cgalutils.cc
|
||||||
../src/CSGTermEvaluator.cc ../src/CGALEvaluator.cc ../src/CGALCache.cc
|
../src/CSGTermEvaluator.cc ../src/CGALEvaluator.cc ../src/CGALCache.cc
|
||||||
../src/PolySetCGALEvaluator.cc ../src/qhash.cc
|
../src/PolySetCGALEvaluator.cc ../src/qhash.cc
|
||||||
|
@ -276,7 +276,7 @@ target_link_libraries(cgalpngtest ${CGAL_LIBRARY} ${CGAL_3RD_PARTY_LIBRARIES} ${
|
||||||
# opencsgtest
|
# opencsgtest
|
||||||
#
|
#
|
||||||
|
|
||||||
add_executable(opencsgtest opencsgtest.cc csgtestcore.cc OffscreenView.cc ${OFFSCREEN_CTX_SOURCE} imageutils.cc fbo.cc
|
add_executable(opencsgtest opencsgtest.cc csgtestcore.cc OffscreenView.cc ${OFFSCREEN_CTX_SOURCE} imageutils.cc fbo.cc system-gl.cc
|
||||||
../src/OpenCSGRenderer.cc ../src/ThrownTogetherRenderer.cc
|
../src/OpenCSGRenderer.cc ../src/ThrownTogetherRenderer.cc
|
||||||
../src/CSGTermEvaluator.cc ../src/CGAL_Nef_polyhedron.cc ../src/cgalutils.cc
|
../src/CSGTermEvaluator.cc ../src/CGAL_Nef_polyhedron.cc ../src/cgalutils.cc
|
||||||
../src/CGALEvaluator.cc ../src/CGALCache.cc ../src/PolySetCGALEvaluator.cc ../src/qhash.cc
|
../src/CGALEvaluator.cc ../src/CGALCache.cc ../src/PolySetCGALEvaluator.cc ../src/qhash.cc
|
||||||
|
|
|
@ -30,7 +30,7 @@ IF (WIN32)
|
||||||
${PROJECT_SOURCE_DIR}/src/nvgl/glew/lib
|
${PROJECT_SOURCE_DIR}/src/nvgl/glew/lib
|
||||||
DOC "The GLEW library")
|
DOC "The GLEW library")
|
||||||
ELSE (WIN32)
|
ELSE (WIN32)
|
||||||
message("GLEW_DIR: " ${GLEW_DIR})
|
message("-- GLEW_DIR: " ${GLEW_DIR})
|
||||||
FIND_PATH( GLEW_INCLUDE_PATH GL/glew.h
|
FIND_PATH( GLEW_INCLUDE_PATH GL/glew.h
|
||||||
PATHS ${GLEW_DIR}/include /usr/include /usr/local/include
|
PATHS ${GLEW_DIR}/include /usr/include /usr/local/include
|
||||||
NO_DEFAULT_PATH
|
NO_DEFAULT_PATH
|
||||||
|
|
|
@ -38,8 +38,8 @@ bool report_glerror(const char * function)
|
||||||
GLenum tGLErr = glGetError();
|
GLenum tGLErr = glGetError();
|
||||||
if (tGLErr != GL_NO_ERROR) {
|
if (tGLErr != GL_NO_ERROR) {
|
||||||
if ( (tGLErr-0x500)<=3 && (tGLErr-0x500)>=0 )
|
if ( (tGLErr-0x500)<=3 && (tGLErr-0x500)>=0 )
|
||||||
cerr << "OpenGL error " << hex << tGLErr << "(" <<
|
cerr << "OpenGL error " << hex << tGLErr << "("
|
||||||
<< gl_errors[tGLErr-0x500] << ") while " << task << endl;
|
<< gl_errors[tGLErr-0x500] << ") while " << function << endl;
|
||||||
else
|
else
|
||||||
cerr << "OpenGL error 0x" << hex << tGLErr << " after " << function << endl;
|
cerr << "OpenGL error 0x" << hex << tGLErr << " after " << function << endl;
|
||||||
return true;
|
return true;
|
||||||
|
|
Loading…
Reference in New Issue