Commit 3af4bf66 authored by unknown's avatar unknown Committed by jean-pierre charras

Idf tools: Minor change for OSX compatibility

parent 771ac33c
...@@ -18,14 +18,7 @@ add_executable( idf2vrml idf2vrml.cpp ) ...@@ -18,14 +18,7 @@ add_executable( idf2vrml idf2vrml.cpp )
target_link_libraries( dxf2idf lib_dxf idf3 ${wxWidgets_LIBRARIES} ) target_link_libraries( dxf2idf lib_dxf idf3 ${wxWidgets_LIBRARIES} )
if( WIN32 ) target_link_libraries( idf2vrml idf3 ${OPENGL_LIBRARIES} ${wxWidgets_LIBRARIES} )
set ( LIB_GLU glu32 )
else()
set ( LIB_GLU GLU )
endif()
target_link_libraries( idf2vrml idf3 ${LIB_GLU} ${wxWidgets_LIBRARIES} )
install( TARGETS idfcyl idfrect dxf2idf idf2vrml install( TARGETS idfcyl idfrect dxf2idf idf2vrml
DESTINATION ${KICAD_BIN} DESTINATION ${KICAD_BIN}
......
...@@ -40,8 +40,6 @@ ...@@ -40,8 +40,6 @@
#include <cmath> #include <cmath>
#include <vrml_layer.h> #include <vrml_layer.h>
#include <wx/glcanvas.h> // CALLBACK definition, needed on Windows
#ifndef CALLBACK #ifndef CALLBACK
#define CALLBACK #define CALLBACK
#endif #endif
......
...@@ -32,8 +32,12 @@ ...@@ -32,8 +32,12 @@
* PCB for VRML output. * PCB for VRML output.
*/ */
#ifndef VRML_BOARD_H #ifndef VRML_LAYER_H
#define VRML_BOARD_H #define VRML_LAYER_H
#include <wx/glcanvas.h> // CALLBACK definition, needed on Windows
// alse needed on OSX to define __DARWIN__
#ifdef __WXMAC__ #ifdef __WXMAC__
# ifdef __DARWIN__ # ifdef __DARWIN__
...@@ -426,4 +430,4 @@ public: ...@@ -426,4 +430,4 @@ public:
const std::string& GetError( void ); const std::string& GetError( void );
}; };
#endif // VRML_BOARD_H #endif // VRML_LAYER_H
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment