haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Idf tools: Minor change for OSX compatibility

This commit is contained in:
unknown 2014-05-29 18:04:54 +02:00 committed by jean-pierre charras
parent 771ac33c80
commit 3af4bf66a2
3 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
utils/idftools/CMakeLists.txt
View File

@ -18,14 +18,7 @@ add_executable( idf2vrml idf2vrml.cpp )
target_link_libraries( dxf2idf lib_dxf idf3 ${wxWidgets_LIBRARIES} )
if( WIN32 )
set ( LIB_GLU glu32 )
else()
set ( LIB_GLU GLU )
endif()
target_link_libraries( idf2vrml idf3 ${LIB_GLU} ${wxWidgets_LIBRARIES} )
target_link_libraries( idf2vrml idf3 ${OPENGL_LIBRARIES} ${wxWidgets_LIBRARIES} )
install( TARGETS idfcyl idfrect dxf2idf idf2vrml
DESTINATION ${KICAD_BIN}

2
utils/idftools/vrml_layer.cpp
View File

@ -40,8 +40,6 @@
#include <cmath>
#include <vrml_layer.h>
#include <wx/glcanvas.h> // CALLBACK definition, needed on Windows
#ifndef CALLBACK
#define CALLBACK
#endif

10
utils/idftools/vrml_layer.h
View File

@ -32,8 +32,12 @@
* PCB for VRML output.
*/
#ifndef VRML_BOARD_H
#define VRML_BOARD_H
#ifndef VRML_LAYER_H
#define VRML_LAYER_H
#include <wx/glcanvas.h> // CALLBACK definition, needed on Windows
// alse needed on OSX to define __DARWIN__
#ifdef __WXMAC__
# ifdef __DARWIN__
@ -426,4 +430,4 @@ public:
const std::string& GetError( void );
};
#endif // VRML_BOARD_H
#endif // VRML_LAYER_H