not build in linux Mandriva 2009.1, minor code cleanup

3d-viewer/3d_aux.cpp

@@ -21,7 +21,6 @@
 #include "bitmaps.h"
 
 #include "3d_viewer.h"
-#include "3d_struct.h"
 #include "trackball.h"
 
 /**************************************************************************/

3d-viewer/3d_class.cpp

@@ -11,7 +11,6 @@
 
 #include "fctsys.h"
 
-#include "3d_struct.h"
 #include "3d_viewer.h"
 
 

3d-viewer/3d_draw.cpp

@@ -13,8 +13,6 @@
 #include "3d_viewer.h"
 #include "trackball.h"
 
-#include "3d_struct.h"
-
 #if !wxUSE_GLCANVAS
 #error Please set wxUSE_GLCANVAS to 1 in setup.h.
 #endif

3d-viewer/3d_read_mesh.cpp

@@ -15,7 +15,6 @@
 #include "kicad_string.h"
 #include "appl_wxstruct.h"
 
-#include "3d_struct.h"
 #include "3d_viewer.h"
 
 

gerbview/CMakeLists.txt

@@ -70,7 +70,7 @@ if(APPLE)
     set_target_properties(gerbview PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist)
 endif(APPLE)
 
-target_link_libraries(gerbview common pcbcommon 3d-viewer polygon bitmaps kbool ${wxWidgets_LIBRARIES})
+target_link_libraries(gerbview common pcbcommon 3d-viewer polygon bitmaps kbool ${OPENGL_LIBRARIES} ${wxWidgets_LIBRARIES})
 
 install(TARGETS gerbview
         DESTINATION ${KICAD_BIN}

pcbnew/CMakeLists.txt

@@ -184,7 +184,7 @@ if(APPLE)
     set_target_properties(pcbnew PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist)
 endif(APPLE)
 
-target_link_libraries(pcbnew 3d-viewer common pcbcommon polygon bitmaps kbool ${wxWidgets_LIBRARIES} ${OPENGL_LIBRARIES})
+target_link_libraries(pcbnew 3d-viewer common pcbcommon polygon bitmaps kbool ${OPENGL_LIBRARIES} ${wxWidgets_LIBRARIES})
 
 install(TARGETS pcbnew
         DESTINATION ${KICAD_BIN}