removed warn compil., updated CMakefiles for macosx and removed obsolete makefile.macosx

3d-viewer/3d_canvas.cpp

@@ -28,7 +28,6 @@
 #include "trackball.h"
 
 /* Tool and button Bitmaps */
-#define XPM_3D_MAIN
 #include "bitmaps.h"
 
 enum onrclick_id {
@@ -63,10 +62,8 @@ EVT_MENU_RANGE( ID_POPUP_3D_VIEW_START, ID_POPUP_3D_VIEW_END,
 END_EVENT_TABLE()
 
 /*************************************************************************/
-Pcb3D_GLCanvas::Pcb3D_GLCanvas( WinEDA3D_DrawFrame* parent, const wxWindowID id,
-                                int* gl_attrib ) :
-    wxGLCanvas( parent, id,
-                wxPoint( -1, -1 ), wxSize( -1, -1 ), wxFULL_REPAINT_ON_RESIZE )
+Pcb3D_GLCanvas::Pcb3D_GLCanvas( WinEDA3D_DrawFrame* parent ) :
+    wxGLCanvas( parent, -1, wxDefaultPosition, wxDefaultSize, wxFULL_REPAINT_ON_RESIZE )
 /*************************************************************************/
 {
     m_init   = FALSE;
@@ -91,7 +88,6 @@ void Pcb3D_GLCanvas::ClearLists()
 {
     if( m_gllist > 0 )
         glDeleteLists( m_gllist, 1 );
-//    m_init   = FALSE;
     m_gllist = 0;
 }
 

3d-viewer/3d_frame.cpp

@@ -32,12 +32,6 @@ double ZBottom;
 double ZTop;
 double DataScale3D;  // coeff de conversion unites utilsateut -> unites 3D
 
-int gl_attrib[] =
-{
-    WX_GL_RGBA, WX_GL_MIN_RED, 8, WX_GL_MIN_GREEN, 8, WX_GL_MIN_BLUE, 8,
-    WX_GL_DEPTH_SIZE, 16, WX_GL_DOUBLEBUFFER, GL_NONE
-};
-
 
 BEGIN_EVENT_TABLE( WinEDA3D_DrawFrame, wxFrame )
     EVT_TOOL_RANGE( ID_ZOOM_IN, ID_ZOOM_PAGE, WinEDA3D_DrawFrame::Process_Zoom )
@@ -84,7 +78,7 @@ WinEDA3D_DrawFrame::WinEDA3D_DrawFrame( WinEDA_BasePcbFrame* parent,
 
     // Make a Pcb3D_GLCanvas
 
-    m_Canvas = new Pcb3D_GLCanvas( this, -1, gl_attrib );
+    m_Canvas = new Pcb3D_GLCanvas( this );
 
     /* init OpenGL once */
     m_Canvas->InitGL();

3d-viewer/3d_viewer.h

@@ -80,8 +80,7 @@ private:
     GLuint m_gllist;
 
 public:
-    Pcb3D_GLCanvas( WinEDA3D_DrawFrame *parent, const wxWindowID id = -1,
-                    int* gl_attrib = NULL);
+    Pcb3D_GLCanvas( WinEDA3D_DrawFrame *parent );
     ~Pcb3D_GLCanvas();
 
     void ClearLists();

3d-viewer/makefile.macosx

@@ -1,29 +0,0 @@
-## Makefile for 3d-viewer.a
-
-include ../libs.macosx
-
-TARGET = 3d-viewer.a
-
-all: $(TARGET)
-
-deps:
-	$(CXX) $(CPPFLAGS) -E -MMD -MG *.cpp >/dev/null
-
-include makefile.include
--include *.d
-
-CPPFLAGS += -DPCBNEW  -I../pcbnew
-EDACPPFLAGS = $(CPPFLAGS)
-
-$(TARGET): $(OBJECTS3D) makefile.macosx makefile.include
-	rm -f $@
-	ar -rv $@ $(OBJECTS3D)
-	ranlib $@
-
-
-clean:
-	rm -f *.o; rm -f *~
-	rm -f $(TARGET)
-
-
-

common/base_struct.cpp

@@ -29,7 +29,7 @@ EDA_BaseStruct::EDA_BaseStruct( EDA_BaseStruct* parent, KICAD_T idType )
 {
     InitVars();
     m_StructType = idType;
-    m_Parent = parent;  /* Chainage hierarchique sur struct racine */
+    m_Parent     = parent; /* Chainage hierarchique sur struct racine */
 }
 
 
@@ -85,7 +85,7 @@ SEARCH_RESULT EDA_BaseStruct::Visit( INSPECTOR* inspector, const void* testData,
 {
     KICAD_T stype;
 
-#if 0 && defined (DEBUG)
+#if 0 && defined(DEBUG)
     std::cout << GetClass().mb_str() << ' ';
 #endif
 
@@ -105,7 +105,7 @@ SEARCH_RESULT EDA_BaseStruct::Visit( INSPECTOR* inspector, const void* testData,
 }
 
 
-#if defined (DEBUG)
+#if defined(DEBUG)
 
 // A function that should have been in wxWidgets
 std::ostream& operator<<( std::ostream& out, const wxSize& size )
@@ -173,9 +173,9 @@ EDA_TextStruct::EDA_TextStruct( const wxString& text )
     m_Mirror    = false;                            // display mirror if true
     m_HJustify  = GR_TEXT_HJUSTIFY_LEFT;
     m_VJustify  = GR_TEXT_VJUSTIFY_CENTER;          /* Justifications Horiz et Vert du texte */
-    m_Width  = 0;                                   /* thickness */
-    m_Italic = false;                               /* true = italic shape */
-    m_Text   = text;
+    m_Width     = 0;                                /* thickness */
+    m_Italic    = false;                            /* true = italic shape */
+    m_Text = text;
 }
 
 
@@ -196,7 +196,7 @@ int EDA_TextStruct::Len_Size()
     if( nbchar == 0 )
         return 0;
 
-    len = (( (10 * m_Size.x ) / 9 ) + m_Width) * nbchar;
+    len = ( ( (10 * m_Size.x ) / 9 ) + m_Width ) * nbchar;
     return len;
 }
 
@@ -211,10 +211,10 @@ bool EDA_TextStruct::HitTest( const wxPoint& posref )
  *      false else.
  */
 {
-    int dx, dy;
+    int     dx, dy;
     wxPoint location;
 
-    dx = (int) (( Pitch() * GetLength() ) / 2);
+    dx = (int) ( ( Pitch() * GetLength() ) / 2 );
     dy = m_Size.y / 2;
 
     /* Is the ref point inside the text area ?  */
@@ -246,15 +246,16 @@ bool EDA_TextStruct::HitTest( EDA_Rect& refArea )
 
 
 /*******************************/
-int EDA_TextStruct::Pitch(int aMinTickness)
+int EDA_TextStruct::Pitch( int aMinTickness )
 /*******************************/
+
 /**
  * Function Pitch
  * @return distance between 2 characters
  * @param aMinTickness = min segments tickness
  */
 {
-    return ((m_Size.x * 10)/9) + MAX( m_Width, aMinTickness);
+    return ( (m_Size.x * 10) / 9 ) + MAX( m_Width, aMinTickness );
 }
 
 
@@ -264,6 +265,7 @@ void EDA_TextStruct::Draw( WinEDA_DrawPanel* aPanel, wxDC* aDC,
                            int aDrawMode,
                            GRFillMode aDisplayMode, EDA_Colors aAnchor_color )
 /***************************************************************/
+
 /** Function Draw
  *  @param aPanel = the current DrawPanel
  *  @param aDC = the current Device Context
@@ -275,67 +277,75 @@ void EDA_TextStruct::Draw( WinEDA_DrawPanel* aPanel, wxDC* aDC,
  */
 
 {
-    wxPoint pos = m_Pos;
-    wxArrayString* list =  wxStringSplit( m_Text, '\n');
+    wxPoint        pos  = m_Pos;
+    wxArrayString* list = wxStringSplit( m_Text, '\n' );
 
-    for( int i=0;i<list->Count();i++)
+    for( unsigned i = 0; i<list->Count(); i++ )
     {
-       wxString txt = list->Item(i);
-       wxSize size=DrawOneLine(aPanel,aDC,aOffset,aColor,aDrawMode,aDisplayMode,aAnchor_color,txt,pos);
-       pos.y+=1.5*(size.y); 
+        wxString txt  = list->Item( i );
+        wxSize   size = DrawOneLine( aPanel,
+                                     aDC,
+                                     aOffset,
+                                     aColor,
+                                     aDrawMode,
+                                     aDisplayMode,
+                                     aAnchor_color,
+                                     txt,
+                                     pos );
+        pos.y += 1.5 * (size.y);
     }
+
     delete (list);
-     
 }
 
 
-
 wxSize EDA_TextStruct::DrawOneLine( WinEDA_DrawPanel* aPanel, wxDC* aDC,
-                           const wxPoint& aOffset, EDA_Colors aColor,
-                           int aDrawMode,
-                           GRFillMode aDisplayMode, EDA_Colors aAnchor_color,
-                           wxString txt, wxPoint pos )
+                                    const wxPoint& aOffset, EDA_Colors aColor,
+                                    int aDrawMode,
+                                    GRFillMode aDisplayMode, EDA_Colors aAnchor_color,
+                                    wxString txt, wxPoint pos )
 {
-      int width = m_Width;
-      if( aDisplayMode == FILAIRE )
-          width = 0;
-
-      if( aDrawMode != -1 )
-          GRSetDrawMode( aDC, aDrawMode );
-
-      /* Draw text anchor, if allowed */
-      if( aAnchor_color != UNSPECIFIED_COLOR )
-      {
-          int anchor_size = aPanel->GetScreen()->Unscale( 2 );
-          aAnchor_color = (EDA_Colors) (aAnchor_color & MASKCOLOR);
-
-          int cX = pos.x + aOffset.x;
-          int cY = pos.y + aOffset.y;
-
-          GRLine( &aPanel->m_ClipBox, aDC, cX - anchor_size, cY,
-                  cX + anchor_size, cY, 0, aAnchor_color );
-
-          GRLine( &aPanel->m_ClipBox, aDC, cX, cY - anchor_size,
-                  cX, cY + anchor_size, 0, aAnchor_color );
-      }
-
-      if( aDisplayMode == SKETCH )
-          width = -width;
-          
-	    wxSize size = m_Size;
-	    
-	    if ( m_Mirror )
-		    size.x = -size.x;
-
-      
-      
-      DrawGraphicText( aPanel, aDC,
-                       aOffset + pos, aColor, txt,
-                       m_Orient, size,
-                       m_HJustify, m_VJustify, width, m_Italic );
-      return size;
+    int width = m_Width;
+
+    if( aDisplayMode == FILAIRE )
+        width = 0;
+
+    if( aDrawMode != -1 )
+        GRSetDrawMode( aDC, aDrawMode );
+
+    /* Draw text anchor, if allowed */
+    if( aAnchor_color != UNSPECIFIED_COLOR )
+    {
+        int anchor_size = aPanel->GetScreen()->Unscale( 2 );
+        aAnchor_color = (EDA_Colors) (aAnchor_color & MASKCOLOR);
+
+        int cX = pos.x + aOffset.x;
+        int cY = pos.y + aOffset.y;
+
+        GRLine( &aPanel->m_ClipBox, aDC, cX - anchor_size, cY,
+                cX + anchor_size, cY, 0, aAnchor_color );
+
+        GRLine( &aPanel->m_ClipBox, aDC, cX, cY - anchor_size,
+                cX, cY + anchor_size, 0, aAnchor_color );
+    }
+
+    if( aDisplayMode == SKETCH )
+        width = -width;
+
+    wxSize size = m_Size;
+
+    if( m_Mirror )
+        size.x = -size.x;
+
+
+    DrawGraphicText( aPanel, aDC,
+                     aOffset + pos, aColor, txt,
+                     m_Orient, size,
+                     m_HJustify, m_VJustify, width, m_Italic );
+    return size;
 }
 
+
 /******************/
 /* Class EDA_Rect */
 /******************/
@@ -369,7 +379,7 @@ bool EDA_Rect::Inside( const wxPoint& point )
 {
     int    rel_posx = point.x - m_Pos.x;
     int    rel_posy = point.y - m_Pos.y;
-    wxSize size = m_Size;
+    wxSize size     = m_Size;
 
     if( size.x < 0 )
     {
@@ -395,10 +405,10 @@ bool EDA_Rect::Intersects( const EDA_Rect aRect ) const
     // this logic taken from wxWidgets' geometry.cpp file:
     bool rc;
 
-    int left   = MAX( m_Pos.x, aRect.m_Pos.x );
-    int right  = MIN( m_Pos.x + m_Size.x, aRect.m_Pos.x + aRect.m_Size.x );
-    int top    = MAX( m_Pos.y, aRect.m_Pos.y );
-    int bottom = MIN( m_Pos.y + m_Size.y, aRect.m_Pos.y + aRect.m_Size.y );
+    int  left   = MAX( m_Pos.x, aRect.m_Pos.x );
+    int  right  = MIN( m_Pos.x + m_Size.x, aRect.m_Pos.x + aRect.m_Size.x );
+    int  top    = MAX( m_Pos.y, aRect.m_Pos.y );
+    int  bottom = MIN( m_Pos.y + m_Size.y, aRect.m_Pos.y + aRect.m_Size.y );
 
     if( left < right && top < bottom )
         rc = true;
@@ -499,7 +509,7 @@ void EDA_Rect::Merge( const EDA_Rect& aRect )
     Normalize();        // ensure width and height >= 0
     EDA_Rect rect = aRect;
     rect.Normalize();   // ensure width and height >= 0
-    wxPoint  end      = GetEnd();
+    wxPoint  end = GetEnd();
     wxPoint  rect_end = rect.GetEnd();
 
     // Change origin and size in order to contain the given rect

common/makefile.macosx

@@ -1,30 +0,0 @@
-## Makefile for common.a
-
-include ../libs.macosx
-
-TARGET = common.a pcbcommon.a
-
-all: $(TARGET)
-
-deps:
-	$(CXX) $(CPPFLAGS) -E -MMD -MG *.cpp >/dev/null
-
-include makefile.include
--include *.d
-
-CPPFLAGS += $(EXTRACPPFLAGS)
-EDACPPFLAGS = $(CPPFLAGS)
-
-common.a: $(COMMON_OBJECTS) makefile.macosx makefile.include
-	rm -f $@
-	ar -rv $@ $(COMMON_OBJECTS)
-	ranlib $@
-
-pcbcommon.a: $(COMMON_PCB_OBJECTS) makefile.macosx makefile.include
-	rm -f $@
-	ar -rv $@ $(COMMON_PCB_OBJECTS)
-	ranlib $@
-
-clean:
-	rm -f *.o; rm -f *~
-	rm -f $(TARGET)

cvpcb/CMakeLists.txt

@@ -38,9 +38,11 @@ if(WIN32)
 endif(WIN32)
 
 if(APPLE)
-    set(CVPCB_RESOURCES cvpcb.icns)
+    set(CVPCB_RESOURCES cvpcb.icns cvpcb_doc.icns)
     set_source_files_properties("${CMAKE_CURRENT_SOURCE_DIR}/cvpcb.icns"
                                 PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
+    set_source_files_properties("${CMAKE_CURRENT_SOURCE_DIR}/cvpcb_doc.icns"
+                                PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
     set(MACOSX_BUNDLE_ICON_FILE cvpcb.icns)
     set(MACOSX_BUNDLE_GUI_IDENTIFIER org.kicad-eda.cvpcb)
     set(MACOSX_BUNDLE_NAME cvpcb)
@@ -48,6 +50,10 @@ endif(APPLE)
 
 add_executable(cvpcb WIN32 MACOSX_BUNDLE ${CVPCB_SRCS} ${CVPCB_RESOURCES})
 
+if(APPLE)
+    set_target_properties(cvpcb PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist)
+endif(APPLE)
+
 target_link_libraries(cvpcb 3d-viewer common pcbcommon polygon bitmaps kbool ${OPENGL_LIBRARIES} ${wxWidgets_LIBRARIES})
 
 install(TARGETS cvpcb

cvpcb/makefile.macosx

@@ -1,41 +0,0 @@
-## Makefile for kicad
-
-include ../libs.macosx
-
-TARGET = cvpcb
-
-all: $(TARGET).app
-
-deps:
-	$(CXX) $(CPPFLAGS) -E -MMD -MG *.cpp >/dev/null
-
-include makefile.include
--include *.d
-
-CPPFLAGS += $(EXTRACPPFLAGS)
-EDACPPFLAGS = $(CPPFLAGS)
-
-$(TARGET): $(OBJECTS) $(TARGET).r makefile.macosx makefile.include $(EXTRALIBS) ../libs.macosx $(LIBVIEWER3D)
-	$(LD) $(OBJECTS) $(LDFLAGS)  $(LIBVIEWER3D) $(LIBS3D) -o $(TARGET)
-	$(RESCOMP) -o $(TARGET) Carbon.r $(TARGET).r
-	$(SETFILE) -a C $(TARGET)
-
-
-$(TARGET).app: $(TARGET)
-	rm -rf $(TARGET).app
-	mkdir -p $(TARGET).app
-	mkdir -p $(TARGET).app/Contents
-	mkdir -p $(TARGET).app/Contents/MacOS
-	mkdir -p $(TARGET).app/Contents/Resources
-	cp $(TARGET).icns $(TARGET).app/Contents/Resources
-	cp Info.plist $(TARGET).app/Contents
-	echo -n "APPL????" > $(TARGET).app/Contents/PkgInfo
-	cp $(TARGET) $(TARGET).app/Contents/MacOS/$(TARGET)
-
-install: $(TARGET).app
-	cp -Rf $(TARGET).app $(KICAD_BIN)
-
-clean:
-	rm -f *.o; rm -f *~
-	rm -rf $(TARGET).app
-	rm -f $(TARGET)

eeschema/CMakeLists.txt

@@ -128,9 +128,11 @@ if(WIN32)
 endif(WIN32)
 
 if(APPLE)
-    set(EESCHEMA_RESOURCES eeschema.icns)
+    set(EESCHEMA_RESOURCES eeschema.icns eeschema_doc.icns)
     set_source_files_properties("${CMAKE_CURRENT_SOURCE_DIR}/eeschema.icns"
                                 PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
+    set_source_files_properties("${CMAKE_CURRENT_SOURCE_DIR}/eeschema_doc.icns"
+                                PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
     set(MACOSX_BUNDLE_ICON_FILE eeschema.icns)
     set(MACOSX_BUNDLE_GUI_IDENTIFIER org.kicad-eda.eeschema)
     set(MACOSX_BUNDLE_NAME eeschema)
@@ -138,6 +140,10 @@ endif(APPLE)
 
 add_executable(eeschema WIN32 MACOSX_BUNDLE ${EESCHEMA_SRCS} ${EESCHEMA_EXTRA_SRCS} ${EESCHEMA_RESOURCES})
 
+if(APPLE)
+    set_target_properties(eeschema PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist)
+endif(APPLE)
+
 target_link_libraries(eeschema common bitmaps ${wxWidgets_LIBRARIES})
 
 install(TARGETS eeschema

eeschema/class_text-label.cpp

@@ -199,6 +199,7 @@ void SCH_TEXT::Draw( WinEDA_DrawPanel* panel, wxDC* DC, const wxPoint& offset,
     
     switch( m_Orient )
     {
+    default:
     case 0: /* Horiz Normal Orientation (left justified) */
         orientation = TEXT_ORIENT_HORIZ;
         Hjustify = GR_TEXT_HJUSTIFY_LEFT;
@@ -228,7 +229,7 @@ void SCH_TEXT::Draw( WinEDA_DrawPanel* panel, wxDC* DC, const wxPoint& offset,
         break;
     }
 
-    for( int i=0;i<list->Count();i++)
+    for( unsigned i=0;i<list->Count();i++)
     {
        wxString txt = list->Item(i);
        

eeschema/makefile.macosx

@@ -1,48 +0,0 @@
-## Makefile for eeschema
-
-include ../libs.macosx
-
-TARGET = eeschema
-
-all: $(TARGET).app netlist_form_pads-pcb
-
-deps:
-	$(CXX) $(CPPFLAGS) -E -MMD -MG *.cpp >/dev/null
-
-include makefile.include
--include *.d
-
-CPPFLAGS += $(EXTRACPPFLAGS)
-EDACPPFLAGS = $(CPPFLAGS)
-
-$(TARGET): $(OBJECTS) $(TARGET).r makefile.macosx makefile.include $(EXTRALIBS) ../libs.macosx
-	$(LD) $(OBJECTS) $(LDFLAGS)  $(LIBS) -o $(TARGET)
-	$(RESCOMP) -o $(TARGET) Carbon.r $(TARGET).r
-	$(SETFILE) -a C $(TARGET)
-
-
-$(TARGET).app: $(TARGET)
-	rm -rf $(TARGET).app
-	mkdir -p $(TARGET).app
-	mkdir -p $(TARGET).app/Contents
-	mkdir -p $(TARGET).app/Contents/MacOS
-	mkdir -p $(TARGET).app/Contents/Resources
-	cp $(TARGET).icns $(TARGET).app/Contents/Resources
-	cp file_sch.icns $(TARGET).app/Contents/Resources
-	cp Info.plist $(TARGET).app/Contents
-	echo -n "APPL????" > $(TARGET).app/Contents/PkgInfo
-	cp $(TARGET) $(TARGET).app/Contents/MacOS/$(TARGET)
-
-netlist_form_pads-pcb: plugins/netlist_form_pads-pcb.cpp
-	g++ -D__UNIX__ $(CXXFLAGS) -Wall plugins/netlist_form_pads-pcb.cpp -o netlist_form_pads-pcb
-	
-
-install: $(TARGET).app
-	cp -Rf $(TARGET).app $(KICAD_BIN)
-	cp -f netlist_form_pads-pcb $(KICAD_BIN)
-
-clean:
-	rm -f *.o; rm -f *~
-	rm -rf $(TARGET).app
-	rm -f $(TARGET)
-	rm -f netlist_form_pads-pcb

gerbview/CMakeLists.txt

@@ -54,9 +54,11 @@ if(WIN32)
 endif(WIN32)
 
 if(APPLE)
-    set(GERBVIEW_RESOURCES gerbview.icns)
+    set(GERBVIEW_RESOURCES gerbview.icns gerbview_doc.icns)
     set_source_files_properties("${CMAKE_CURRENT_SOURCE_DIR}/gerbview.icns"
                                 PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
+    set_source_files_properties("${CMAKE_CURRENT_SOURCE_DIR}/gerbview_doc.icns"
+                                PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
     set(MACOSX_BUNDLE_ICON_FILE gerbview.icns)
     set(MACOSX_BUNDLE_GUI_IDENTIFIER org.kicad-eda.gerbview)
     set(MACOSX_BUNDLE_NAME gerbview)
@@ -64,6 +66,10 @@ endif(APPLE)
 
 add_executable(gerbview WIN32 MACOSX_BUNDLE ${GERBVIEW_SRCS} ${GERBVIEW_EXTRA_SRCS} ${GERBVIEW_RESOURCES})
 
+if(APPLE)
+    set_target_properties(gerbview PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist)
+endif(APPLE)
+
 target_link_libraries(gerbview 3d-viewer common pcbcommon polygon bitmaps kbool ${wxWidgets_LIBRARIES})
 
 install(TARGETS gerbview

gerbview/makefile.macosx

@@ -1,40 +0,0 @@
-## Makefile for gerbview
-
-include ../libs.macosx
-
-TARGET = gerbview
-
-all: $(TARGET).app
-
-deps:
-	$(CXX) $(CPPFLAGS) -E -MMD -MG *.cpp >/dev/null
-
-include makefile.include
--include *.d
-
-CPPFLAGS += $(EXTRACPPFLAGS)
-EDACPPFLAGS = $(CPPFLAGS)
-
-$(TARGET): $(OBJECTS) $(TARGET).r makefile.macosx makefile.include $(EXTRALIBS) ../libs.macosx
-	$(LD) $(OBJECTS) $(LDFLAGS) $(LIBS) -o $(TARGET)
-	$(RESCOMP) -o $(TARGET) Carbon.r $(TARGET).r
-	$(SETFILE) -a C $(TARGET)
-
-$(TARGET).app: $(TARGET)
-	rm -rf $(TARGET).app
-	mkdir -p $(TARGET).app
-	mkdir -p $(TARGET).app/Contents
-	mkdir -p $(TARGET).app/Contents/MacOS
-	mkdir -p $(TARGET).app/Contents/Resources
-	cp $(TARGET).icns $(TARGET).app/Contents/Resources
-	cp Info.plist $(TARGET).app/Contents
-	echo -n "APPL????" > $(TARGET).app/Contents/PkgInfo
-	cp $(TARGET) $(TARGET).app/Contents/MacOS/$(TARGET)
-
-install: $(TARGET).app
-	cp -Rf $(TARGET).app $(KICAD_BIN)
-
-clean:
-	rm -f *.o; rm -f *~
-	rm -rf $(TARGET).app
-	rm -f $(TARGET)

kicad/CMakeLists.txt

@@ -25,9 +25,11 @@ if(WIN32)
 endif(WIN32)
 
 if(APPLE)
-    set(KICAD_RESOURCES kicad.icns)
+    set(KICAD_RESOURCES kicad.icns kicad_doc.icns)
     set_source_files_properties("${CMAKE_CURRENT_SOURCE_DIR}/kicad.icns"
                                 PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
+    set_source_files_properties("${CMAKE_CURRENT_SOURCE_DIR}/kicad_doc.icns"
+                                PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
     set(MACOSX_BUNDLE_ICON_FILE kicad.icns)
     set(MACOSX_BUNDLE_GUI_IDENTIFIER org.kicad-eda.kicad)
     set(MACOSX_BUNDLE_NAME kicad)
@@ -35,6 +37,10 @@ endif(APPLE)
 
 add_executable(kicad WIN32 MACOSX_BUNDLE ${KICAD_SRCS} ${KICAD_EXTRA_SRCS} ${KICAD_RESOURCES})
 
+if(APPLE)
+    set_target_properties(kicad PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist)
+endif(APPLE)
+
 target_link_libraries(kicad common bitmaps ${wxWidgets_LIBRARIES})
 
 install(TARGETS kicad

kicad/makefile.macosx

@@ -1,42 +0,0 @@
-## Makefile for kicad
-
-include ../libs.macosx
-
-TARGET = kicad
-
-all: $(TARGET).app
-
-deps:
-	$(CXX) $(CPPFLAGS) -E -MMD -MG *.cpp >/dev/null
-
-include makefile.include
--include *.d
-
-CPPFLAGS += $(EXTRACPPFLAGS)
-EDACPPFLAGS = $(CPPFLAGS)
-
-$(TARGET): $(OBJECTS) $(TARGET).r makefile.macosx makefile.include $(EXTRALIBS) ../libs.macosx
-	$(LD) $(OBJECTS) $(LDFLAGS) $(LIBS) -o $(TARGET)
-	$(RESCOMP) -o $(TARGET) Carbon.r $(TARGET).r
-	$(SETFILE) -a C $(TARGET)
-
-
-$(TARGET).app: $(TARGET)
-	rm -rf $(TARGET).app
-	mkdir -p $(TARGET).app
-	mkdir -p $(TARGET).app/Contents
-	mkdir -p $(TARGET).app/Contents/MacOS
-	mkdir -p $(TARGET).app/Contents/Resources
-	cp $(TARGET).icns $(TARGET).app/Contents/Resources
-	cp file_pro.icns $(TARGET).app/Contents/Resources
-	cp Info.plist $(TARGET).app/Contents
-	echo -n "APPL????" > $(TARGET).app/Contents/PkgInfo
-	cp $(TARGET) $(TARGET).app/Contents/MacOS/$(TARGET)
-
-install: $(TARGET).app
-	cp -Rf $(TARGET).app $(KICAD_BIN)
-
-clean:
-	rm -f *.o; rm -f *~
-	rm -rf $(TARGET).app
-	rm -f $(TARGET)

makefile.macosx

@@ -1,19 +0,0 @@
-KICAD_SUBDIRS =  common 3d-viewer polygon eeschema pcbnew cvpcb kicad gerbview
-KICAD_SUBDIRS_BIN =  eeschema pcbnew cvpcb kicad gerbview
-# How to invoke make:
-MAKE = make -f makefile.macosx
-MAKE_INSTALL = make -f makefile.macosx install
-MAKE_CLEAN = make -f makefile.macosx clean
-
-
-all:
-	@for d in $(KICAD_SUBDIRS); do (cd $$d && $(MAKE)); done
-
-deps:
-	@for d in $(KICAD_SUBDIRS); do (cd $$d && $(MAKE) -k deps); done
-
-install:
-	@for d in $(KICAD_SUBDIRS_BIN); do (cd $$d && $(MAKE_INSTALL)); done
-	
-clean:
-	@for d in $(KICAD_SUBDIRS); do (cd $$d && $(MAKE_CLEAN)); done

osx-package/osx-package.pmdoc/01cvpcb-contents.xml

@@ -1 +0,0 @@
-<pkg-contents spec="1.12"/>

osx-package/osx-package.pmdoc/01cvpcb.xml

@@ -1 +0,0 @@
-<pkgref spec="1.12" uuid="01774BEE-6C94-4919-AE05-C5E0A75F0D2F"><config><identifier>net.sourceforge.kicad.cvpcb</identifier><version>1</version><description></description><post-install type="none"/><installFrom relative="true" mod="true" includeRoot="true">cvpcb/cvpcb.app</installFrom><installTo mod="true" relocatable="true">/Applications/Kicad</installTo><flags><followSymbolicLinks/></flags><packageStore type="internal"></packageStore><mod>parent</mod><mod>installFrom.path</mod><mod>installTo.isAbsoluteType</mod><mod>relocatable</mod><mod>installFrom.isRelativeType</mod><mod>includeRoot</mod><mod>installTo.path</mod><mod>installTo</mod><mod>identifier</mod></config><contents><component id="org.kicad-eda.cvpcb" path="/Users/marco/Development/kicad/kicad_d/cvpcb/cvpcb.app" version=""/><filter>/CVS$</filter><filter>/\.svn$</filter><filter>/\.cvsignore$</filter><filter>/\.cvspass$</filter><filter>/\.DS_Store$</filter></contents></pkgref>

osx-package/osx-package.pmdoc/02eeschema-contents.xml

@@ -1 +0,0 @@
-<pkg-contents spec="1.12"/>

osx-package/osx-package.pmdoc/02eeschema.xml

@@ -1 +0,0 @@
-<pkgref spec="1.12" uuid="1344870A-AE52-4226-BB60-0E9252D34825"><config><identifier>net.sourceforge.kicad.eeschema</identifier><version>1</version><description></description><post-install type="none"/><installFrom relative="true" mod="true" includeRoot="true">eeschema/eeschema.app</installFrom><installTo mod="true" relocatable="true">/Applications/Kicad</installTo><flags><followSymbolicLinks/></flags><packageStore type="internal"></packageStore><mod>parent</mod><mod>installFrom.path</mod><mod>installTo.isAbsoluteType</mod><mod>installFrom.isAbsoluteType</mod><mod>relocatable</mod><mod>installFrom.isRelativeType</mod><mod>includeRoot</mod><mod>installTo.path</mod><mod>installTo</mod><mod>identifier</mod></config><contents><component id="org.kicad-eda.eeschema" path="/Users/marco/Development/kicad/kicad_d/eeschema/eeschema.app" version=""/><filter>/CVS$</filter><filter>/\.svn$</filter><filter>/\.cvsignore$</filter><filter>/\.cvspass$</filter><filter>/\.DS_Store$</filter></contents></pkgref>

osx-package/osx-package.pmdoc/03pcbnew-contents.xml

@@ -1 +0,0 @@
-<pkg-contents spec="1.12"/>

osx-package/osx-package.pmdoc/03pcbnew.xml

@@ -1 +0,0 @@
-<pkgref spec="1.12" uuid="37277ADA-6220-4C27-8980-D9028F265267"><config><identifier>net.sourceforge.kicad.pcbnew</identifier><version>1</version><description></description><post-install type="none"/><installFrom relative="true" mod="true" includeRoot="true">pcbnew/pcbnew.app</installFrom><installTo mod="true" relocatable="true">/Applications/Kicad</installTo><flags><followSymbolicLinks/></flags><packageStore type="internal"></packageStore><mod>parent</mod><mod>identifier</mod><mod>installTo.isAbsoluteType</mod><mod>includeRoot</mod><mod>installFrom.path</mod><mod>installTo</mod><mod>installTo.path</mod></config><contents><component id="org.kicad-eda.pcbnew" path="/Users/marco/Development/kicad/kicad_d/pcbnew/pcbnew.app" version=""/><filter>/CVS$</filter><filter>/\.svn$</filter><filter>/\.cvsignore$</filter><filter>/\.cvspass$</filter><filter>/\.DS_Store$</filter></contents></pkgref>

osx-package/osx-package.pmdoc/04kicad-contents.xml

@@ -1 +0,0 @@
-<pkg-contents spec="1.12"/>

osx-package/osx-package.pmdoc/04kicad.xml

@@ -1 +0,0 @@
-<pkgref spec="1.12" uuid="16332325-42A3-47AC-AF70-A6501E7A012D"><config><identifier>net.sourceforge.kicad.kicad</identifier><version>1</version><description></description><post-install type="none"/><installFrom relative="true" mod="true" includeRoot="true">kicad/kicad.app</installFrom><installTo mod="true" relocatable="true">/Applications/Kicad</installTo><flags><followSymbolicLinks/></flags><packageStore type="internal"></packageStore><mod>parent</mod><mod>identifier</mod><mod>installTo.isAbsoluteType</mod><mod>includeRoot</mod><mod>installFrom.path</mod><mod>installTo</mod><mod>installTo.path</mod></config><contents><component id="org.kicad-eda.kicad" path="/Users/marco/Development/kicad/kicad_d/kicad/kicad.app" version=""/><filter>/CVS$</filter><filter>/\.svn$</filter><filter>/\.cvsignore$</filter><filter>/\.cvspass$</filter><filter>/\.DS_Store$</filter></contents></pkgref>

osx-package/osx-package.pmdoc/05gerbview-contents.xml

@@ -1 +0,0 @@
-<pkg-contents spec="1.12"/>

osx-package/osx-package.pmdoc/05gerbview.xml

@@ -1 +0,0 @@
-<pkgref spec="1.12" uuid="0D9066DC-1B97-47AB-910B-612A3D447EE8"><config><identifier>net.sourceforge.kicad.gerbview</identifier><version>1</version><description></description><post-install type="none"/><installFrom relative="true" mod="true" includeRoot="true">gerbview/gerbview.app</installFrom><installTo mod="true" relocatable="true">/Applications/Kicad</installTo><flags><followSymbolicLinks/></flags><packageStore type="internal"></packageStore><mod>parent</mod><mod>installTo</mod><mod>installTo.isAbsoluteType</mod><mod>version</mod><mod>includeRoot</mod><mod>installTo.path</mod><mod>identifier</mod><mod>installFrom.path</mod></config><contents><component id="org.kicad-eda.gerbview" path="/Users/marco/Development/kicad/kicad_d/gerbview/gerbview.app" version=""/><filter>/CVS$</filter><filter>/\.svn$</filter><filter>/\.cvsignore$</filter><filter>/\.cvspass$</filter><filter>/\.DS_Store$</filter></contents></pkgref>

osx-package/osx-package.pmdoc/06demos.xml

@@ -1 +0,0 @@
-<pkgref spec="1.12" uuid="29C97DEE-FDAD-474F-BB53-64DD599F7ADB"><config><identifier>net.sourceforge.kicad.demos</identifier><version>1</version><description></description><post-install type="none"/><requireAuthorization/><installFrom relative="true" mod="true" includeRoot="true">demos</installFrom><installTo mod="true">/Applications/Kicad</installTo><flags><followSymbolicLinks/></flags><packageStore type="internal"></packageStore><mod>parent</mod><mod>installTo</mod><mod>requireAuthorization</mod><mod>installTo.isAbsoluteType</mod><mod>installTo.isRelativeType</mod><mod>includeRoot</mod><mod>installTo.path</mod><mod>identifier</mod><mod>installFrom.path</mod></config><contents><file-list>06demos-contents.xml</file-list><filter>/CVS$</filter><filter>/\.svn$</filter><filter>/\.cvsignore$</filter><filter>/\.cvspass$</filter><filter>/\.DS_Store$</filter><filter>/CMake</filter><filter>/cmake</filter><filter>/Makefile</filter></contents></pkgref>

osx-package/osx-package.pmdoc/index.xml

@@ -1 +0,0 @@
-<pkmkdoc spec="1.12"><properties><title>Kicad</title><build>/Users/marco/Development/kicad/kicad_d/Kicad.mpkg</build><organization>net.sourceforge.kicad</organization><userSees ui="both"/><min-target os="2"/><domain anywhere="true"/></properties><distribution><versions min-spec="1.000000"/><scripts></scripts></distribution><contents><choice title="cvpcb" id="choice0" starts_selected="true" starts_enabled="true" starts_hidden="false"><pkgref id="net.sourceforge.kicad.cvpcb"/></choice><choice title="eeschema" id="choice1" starts_selected="true" starts_enabled="true" starts_hidden="false"><pkgref id="net.sourceforge.kicad.eeschema"/></choice><choice title="pcbnew" id="choice2" starts_selected="true" starts_enabled="true" starts_hidden="false"><pkgref id="net.sourceforge.kicad.pcbnew"/></choice><choice title="kicad" id="choice3" starts_selected="true" starts_enabled="true" starts_hidden="false"><pkgref id="net.sourceforge.kicad.kicad"/></choice><choice title="gerbview" id="choice4" starts_selected="true" starts_enabled="true" starts_hidden="false"><pkgref id="net.sourceforge.kicad.gerbview"/></choice><choice title="demos" id="choice10" starts_selected="true" starts_enabled="true" starts_hidden="false"><pkgref id="net.sourceforge.kicad.demos"/></choice></contents><resources bg-scale="none" bg-align="topleft"><locale lang="en"><resource relative="true" mod="true" type="license">AUTHORS.txt</resource></locale></resources><flags/><item type="file">01cvpcb.xml</item><item type="file">02eeschema.xml</item><item type="file">03pcbnew.xml</item><item type="file">04kicad.xml</item><item type="file">05gerbview.xml</item><item type="file">06demos.xml</item><mod>properties.anywhereDomain</mod><mod>properties.title</mod></pkmkdoc>

pcbnew/CMakeLists.txt

@@ -162,16 +162,23 @@ if(WIN32)
 endif(WIN32)
 
 if(APPLE)
-    set(PCBNEW_RESOURCES pcbnew.icns)
+    set(PCBNEW_RESOURCES pcbnew.icns pcbnew_doc.icns)
     set_source_files_properties("${CMAKE_CURRENT_SOURCE_DIR}/pcbnew.icns"
                                 PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
+    set_source_files_properties("${CMAKE_CURRENT_SOURCE_DIR}/pcbnew_doc.icns"
+                                PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
     set(MACOSX_BUNDLE_ICON_FILE pcbnew.icns)
     set(MACOSX_BUNDLE_GUI_IDENTIFIER org.kicad-eda.pcbnew)
     set(MACOSX_BUNDLE_NAME pcbnew)
+    set(MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist)
 endif(APPLE)
 
 add_executable(pcbnew WIN32 MACOSX_BUNDLE ${PCBNEW_SRCS} ${PCBNEW_EXTRA_SRCS} ${PCBNEW_RESOURCES})
 
+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})
 
 install(TARGETS pcbnew

pcbnew/makefile.macosx

@@ -1,40 +0,0 @@
-## Makefile for pcbnew
-
-include ../libs.macosx
-
-TARGET = pcbnew
-
-all: $(TARGET).app
-
-deps:
-	$(CXX) $(CPPFLAGS) -E -MMD -MG *.cpp >/dev/null
-
-include makefile.include
--include *.d
-
-CPPFLAGS += $(EXTRACPPFLAGS)
-EDACPPFLAGS = $(CPPFLAGS)
-
-$(TARGET): $(OBJECTS) $(TARGET).r makefile.macosx  makefile.include $(LIBVIEWER3D) $(EXTRALIBS) ../libs.macosx
-	$(LD) $(LDFLAGS) $(OBJECTS) $(LIBVIEWER3D) $(LIBS3D) -o $(TARGET)
-	$(RESCOMP) -o $(TARGET) Carbon.r $(TARGET).r
-	$(SETFILE) -a C $(TARGET)
-
-$(TARGET).app: $(TARGET)
-	rm -rf $(TARGET).app
-	mkdir -p $(TARGET).app
-	mkdir -p $(TARGET).app/Contents
-	mkdir -p $(TARGET).app/Contents/MacOS
-	mkdir -p $(TARGET).app/Contents/Resources
-	cp $(TARGET).icns $(TARGET).app/Contents/Resources
-	cp Info.plist $(TARGET).app/Contents
-	echo -n "APPL????" > $(TARGET).app/Contents/PkgInfo
-	cp $(TARGET) $(TARGET).app/Contents/MacOS/$(TARGET)
-
-install: $(TARGET).app
-	cp -Rf $(TARGET).app $(KICAD_BIN)
-
-clean:
-	rm -f *.o; rm -f *~
-	rm -rf $(TARGET).app
-	rm -f $(TARGET)