Skip to content

K
kicad-source-mirror
Commit a6278c25 authored by charras's avatar charras
Browse files
Options

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

parent fb25b5c4
Show whitespace changes
Inline Side-by-side
Showing with 119 additions and 390 deletions
3d-viewer/3d_canvas.cpp
View file @ a6278c25
...@@ -28,7 +28,6 @@ ...@@ -28,7 +28,6 @@
#include "trackball.h" #include "trackball.h"
/* Tool and button Bitmaps */ /* Tool and button Bitmaps */
#define XPM_3D_MAIN
#include "bitmaps.h" #include "bitmaps.h"
enum onrclick_id { enum onrclick_id {
...@@ -63,10 +62,8 @@ EVT_MENU_RANGE( ID_POPUP_3D_VIEW_START, ID_POPUP_3D_VIEW_END, ...@@ -63,10 +62,8 @@ EVT_MENU_RANGE( ID_POPUP_3D_VIEW_START, ID_POPUP_3D_VIEW_END,
END_EVENT_TABLE() END_EVENT_TABLE()
/*************************************************************************/ /*************************************************************************/
Pcb3D_GLCanvas::Pcb3D_GLCanvas( WinEDA3D_DrawFrame* parent, const wxWindowID id, Pcb3D_GLCanvas::Pcb3D_GLCanvas( WinEDA3D_DrawFrame* parent ) :
int* gl_attrib ) : wxGLCanvas( parent, -1, wxDefaultPosition, wxDefaultSize, wxFULL_REPAINT_ON_RESIZE )
wxGLCanvas( parent, id,
wxPoint( -1, -1 ), wxSize( -1, -1 ), wxFULL_REPAINT_ON_RESIZE )
/*************************************************************************/ /*************************************************************************/
{ {
m_init = FALSE; m_init = FALSE;
...@@ -91,7 +88,6 @@ void Pcb3D_GLCanvas::ClearLists() ...@@ -91,7 +88,6 @@ void Pcb3D_GLCanvas::ClearLists()
{ {
if( m_gllist > 0 ) if( m_gllist > 0 )
glDeleteLists( m_gllist, 1 ); glDeleteLists( m_gllist, 1 );
// m_init = FALSE;
m_gllist = 0; m_gllist = 0;
} }
......
3d-viewer/3d_frame.cpp
View file @ a6278c25
...@@ -32,12 +32,6 @@ double ZBottom; ...@@ -32,12 +32,6 @@ double ZBottom;
double ZTop; double ZTop;
double DataScale3D; // coeff de conversion unites utilsateut -> unites 3D 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 ) BEGIN_EVENT_TABLE( WinEDA3D_DrawFrame, wxFrame )
EVT_TOOL_RANGE( ID_ZOOM_IN, ID_ZOOM_PAGE, WinEDA3D_DrawFrame::Process_Zoom ) EVT_TOOL_RANGE( ID_ZOOM_IN, ID_ZOOM_PAGE, WinEDA3D_DrawFrame::Process_Zoom )
...@@ -84,7 +78,7 @@ WinEDA3D_DrawFrame::WinEDA3D_DrawFrame( WinEDA_BasePcbFrame* parent, ...@@ -84,7 +78,7 @@ WinEDA3D_DrawFrame::WinEDA3D_DrawFrame( WinEDA_BasePcbFrame* parent,
// Make a Pcb3D_GLCanvas // Make a Pcb3D_GLCanvas
m_Canvas = new Pcb3D_GLCanvas( this, -1, gl_attrib ); m_Canvas = new Pcb3D_GLCanvas( this );
/* init OpenGL once */ /* init OpenGL once */
m_Canvas->InitGL(); m_Canvas->InitGL();
......
3d-viewer/3d_viewer.h
View file @ a6278c25
...@@ -80,8 +80,7 @@ private: ...@@ -80,8 +80,7 @@ private:
GLuint m_gllist; GLuint m_gllist;
public: public:
Pcb3D_GLCanvas( WinEDA3D_DrawFrame *parent, const wxWindowID id = -1, Pcb3D_GLCanvas( WinEDA3D_DrawFrame *parent );
int* gl_attrib = NULL);
~Pcb3D_GLCanvas(); ~Pcb3D_GLCanvas();
void ClearLists(); void ClearLists();
......
3d-viewer/makefile.macosx deleted 100644 → 0
View file @ fb25b5c4
## 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
View file @ a6278c25
...@@ -85,7 +85,7 @@ SEARCH_RESULT EDA_BaseStruct::Visit( INSPECTOR* inspector, const void* testData, ...@@ -85,7 +85,7 @@ SEARCH_RESULT EDA_BaseStruct::Visit( INSPECTOR* inspector, const void* testData,
{ {
KICAD_T stype; KICAD_T stype;
#if 0 && defined (DEBUG) #if 0 && defined(DEBUG)
std::cout << GetClass().mb_str() << ' '; std::cout << GetClass().mb_str() << ' ';
#endif #endif
...@@ -105,7 +105,7 @@ SEARCH_RESULT EDA_BaseStruct::Visit( INSPECTOR* inspector, const void* testData, ...@@ -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 // A function that should have been in wxWidgets
std::ostream& operator<<( std::ostream& out, const wxSize& size ) std::ostream& operator<<( std::ostream& out, const wxSize& size )
...@@ -196,7 +196,7 @@ int EDA_TextStruct::Len_Size() ...@@ -196,7 +196,7 @@ int EDA_TextStruct::Len_Size()
if( nbchar == 0 ) if( nbchar == 0 )
return 0; return 0;
len = (( (10 * m_Size.x ) / 9 ) + m_Width) * nbchar; len = ( ( (10 * m_Size.x ) / 9 ) + m_Width ) * nbchar;
return len; return len;
} }
...@@ -214,7 +214,7 @@ bool EDA_TextStruct::HitTest( const wxPoint& posref ) ...@@ -214,7 +214,7 @@ bool EDA_TextStruct::HitTest( const wxPoint& posref )
int dx, dy; int dx, dy;
wxPoint location; wxPoint location;
dx = (int) (( Pitch() * GetLength() ) / 2); dx = (int) ( ( Pitch() * GetLength() ) / 2 );
dy = m_Size.y / 2; dy = m_Size.y / 2;
/* Is the ref point inside the text area ? */ /* Is the ref point inside the text area ? */
...@@ -246,15 +246,16 @@ bool EDA_TextStruct::HitTest( EDA_Rect& refArea ) ...@@ -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 * Function Pitch
* @return distance between 2 characters * @return distance between 2 characters
* @param aMinTickness = min segments tickness * @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, ...@@ -264,6 +265,7 @@ void EDA_TextStruct::Draw( WinEDA_DrawPanel* aPanel, wxDC* aDC,
int aDrawMode, int aDrawMode,
GRFillMode aDisplayMode, EDA_Colors aAnchor_color ) GRFillMode aDisplayMode, EDA_Colors aAnchor_color )
/***************************************************************/ /***************************************************************/
/** Function Draw /** Function Draw
* @param aPanel = the current DrawPanel * @param aPanel = the current DrawPanel
* @param aDC = the current Device Context * @param aDC = the current Device Context
...@@ -276,20 +278,27 @@ void EDA_TextStruct::Draw( WinEDA_DrawPanel* aPanel, wxDC* aDC, ...@@ -276,20 +278,27 @@ void EDA_TextStruct::Draw( WinEDA_DrawPanel* aPanel, wxDC* aDC,
{ {
wxPoint pos = m_Pos; wxPoint pos = m_Pos;
wxArrayString* list = wxStringSplit( m_Text, '\n'); 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); wxString txt = list->Item( i );
wxSize size=DrawOneLine(aPanel,aDC,aOffset,aColor,aDrawMode,aDisplayMode,aAnchor_color,txt,pos); wxSize size = DrawOneLine( aPanel,
pos.y+=1.5*(size.y); aDC,
aOffset,
aColor,
aDrawMode,
aDisplayMode,
aAnchor_color,
txt,
pos );
pos.y += 1.5 * (size.y);
} }
delete (list);
delete (list);
} }
wxSize EDA_TextStruct::DrawOneLine( WinEDA_DrawPanel* aPanel, wxDC* aDC, wxSize EDA_TextStruct::DrawOneLine( WinEDA_DrawPanel* aPanel, wxDC* aDC,
const wxPoint& aOffset, EDA_Colors aColor, const wxPoint& aOffset, EDA_Colors aColor,
int aDrawMode, int aDrawMode,
...@@ -297,6 +306,7 @@ wxSize EDA_TextStruct::DrawOneLine( WinEDA_DrawPanel* aPanel, wxDC* aDC, ...@@ -297,6 +306,7 @@ wxSize EDA_TextStruct::DrawOneLine( WinEDA_DrawPanel* aPanel, wxDC* aDC,
wxString txt, wxPoint pos ) wxString txt, wxPoint pos )
{ {
int width = m_Width; int width = m_Width;
if( aDisplayMode == FILAIRE ) if( aDisplayMode == FILAIRE )
width = 0; width = 0;
...@@ -324,11 +334,10 @@ wxSize EDA_TextStruct::DrawOneLine( WinEDA_DrawPanel* aPanel, wxDC* aDC, ...@@ -324,11 +334,10 @@ wxSize EDA_TextStruct::DrawOneLine( WinEDA_DrawPanel* aPanel, wxDC* aDC,
wxSize size = m_Size; wxSize size = m_Size;
if ( m_Mirror ) if( m_Mirror )
size.x = -size.x; size.x = -size.x;
DrawGraphicText( aPanel, aDC, DrawGraphicText( aPanel, aDC,
aOffset + pos, aColor, txt, aOffset + pos, aColor, txt,
m_Orient, size, m_Orient, size,
...@@ -336,6 +345,7 @@ wxSize EDA_TextStruct::DrawOneLine( WinEDA_DrawPanel* aPanel, wxDC* aDC, ...@@ -336,6 +345,7 @@ wxSize EDA_TextStruct::DrawOneLine( WinEDA_DrawPanel* aPanel, wxDC* aDC,
return size; return size;
} }
/******************/ /******************/
/* Class EDA_Rect */ /* Class EDA_Rect */
/******************/ /******************/
......
common/makefile.macosx deleted 100644 → 0
View file @ fb25b5c4
## 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
View file @ a6278c25
...@@ -38,9 +38,11 @@ if(WIN32) ...@@ -38,9 +38,11 @@ if(WIN32)
endif(WIN32) endif(WIN32)
if(APPLE) 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" set_source_files_properties("${CMAKE_CURRENT_SOURCE_DIR}/cvpcb.icns"
PROPERTIES MACOSX_PACKAGE_LOCATION Resources) 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_ICON_FILE cvpcb.icns)
set(MACOSX_BUNDLE_GUI_IDENTIFIER org.kicad-eda.cvpcb) set(MACOSX_BUNDLE_GUI_IDENTIFIER org.kicad-eda.cvpcb)
set(MACOSX_BUNDLE_NAME cvpcb) set(MACOSX_BUNDLE_NAME cvpcb)
...@@ -48,6 +50,10 @@ endif(APPLE) ...@@ -48,6 +50,10 @@ endif(APPLE)
add_executable(cvpcb WIN32 MACOSX_BUNDLE ${CVPCB_SRCS} ${CVPCB_RESOURCES}) 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}) target_link_libraries(cvpcb 3d-viewer common pcbcommon polygon bitmaps kbool ${OPENGL_LIBRARIES} ${wxWidgets_LIBRARIES})
install(TARGETS cvpcb install(TARGETS cvpcb
......
cvpcb/makefile.macosx deleted 100644 → 0
View file @ fb25b5c4
## 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
View file @ a6278c25
...@@ -128,9 +128,11 @@ if(WIN32) ...@@ -128,9 +128,11 @@ if(WIN32)
endif(WIN32) endif(WIN32)
if(APPLE) 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" set_source_files_properties("${CMAKE_CURRENT_SOURCE_DIR}/eeschema.icns"
PROPERTIES MACOSX_PACKAGE_LOCATION Resources) 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_ICON_FILE eeschema.icns)
set(MACOSX_BUNDLE_GUI_IDENTIFIER org.kicad-eda.eeschema) set(MACOSX_BUNDLE_GUI_IDENTIFIER org.kicad-eda.eeschema)
set(MACOSX_BUNDLE_NAME eeschema) set(MACOSX_BUNDLE_NAME eeschema)
...@@ -138,6 +140,10 @@ endif(APPLE) ...@@ -138,6 +140,10 @@ endif(APPLE)
add_executable(eeschema WIN32 MACOSX_BUNDLE ${EESCHEMA_SRCS} ${EESCHEMA_EXTRA_SRCS} ${EESCHEMA_RESOURCES}) 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}) target_link_libraries(eeschema common bitmaps ${wxWidgets_LIBRARIES})
install(TARGETS eeschema install(TARGETS eeschema
......
eeschema/class_text-label.cpp
View file @ a6278c25
...@@ -199,6 +199,7 @@ void SCH_TEXT::Draw( WinEDA_DrawPanel* panel, wxDC* DC, const wxPoint& offset, ...@@ -199,6 +199,7 @@ void SCH_TEXT::Draw( WinEDA_DrawPanel* panel, wxDC* DC, const wxPoint& offset,
switch( m_Orient ) switch( m_Orient )
{ {
default:
case 0: /* Horiz Normal Orientation (left justified) */ case 0: /* Horiz Normal Orientation (left justified) */
orientation = TEXT_ORIENT_HORIZ; orientation = TEXT_ORIENT_HORIZ;
Hjustify = GR_TEXT_HJUSTIFY_LEFT; Hjustify = GR_TEXT_HJUSTIFY_LEFT;
...@@ -228,7 +229,7 @@ void SCH_TEXT::Draw( WinEDA_DrawPanel* panel, wxDC* DC, const wxPoint& offset, ...@@ -228,7 +229,7 @@ void SCH_TEXT::Draw( WinEDA_DrawPanel* panel, wxDC* DC, const wxPoint& offset,
break; break;
} }
for( int i=0;i<list->Count();i++) for( unsigned i=0;i<list->Count();i++)
{ {
wxString txt = list->Item(i); wxString txt = list->Item(i);
......
eeschema/makefile.macosx deleted 100644 → 0
View file @ fb25b5c4
## 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
\ No newline at end of file
gerbview/CMakeLists.txt
View file @ a6278c25
...@@ -54,9 +54,11 @@ if(WIN32) ...@@ -54,9 +54,11 @@ if(WIN32)
endif(WIN32) endif(WIN32)
if(APPLE) 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" set_source_files_properties("${CMAKE_CURRENT_SOURCE_DIR}/gerbview.icns"
PROPERTIES MACOSX_PACKAGE_LOCATION Resources) 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_ICON_FILE gerbview.icns)
set(MACOSX_BUNDLE_GUI_IDENTIFIER org.kicad-eda.gerbview) set(MACOSX_BUNDLE_GUI_IDENTIFIER org.kicad-eda.gerbview)
set(MACOSX_BUNDLE_NAME gerbview) set(MACOSX_BUNDLE_NAME gerbview)
...@@ -64,6 +66,10 @@ endif(APPLE) ...@@ -64,6 +66,10 @@ endif(APPLE)
add_executable(gerbview WIN32 MACOSX_BUNDLE ${GERBVIEW_SRCS} ${GERBVIEW_EXTRA_SRCS} ${GERBVIEW_RESOURCES}) 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}) target_link_libraries(gerbview 3d-viewer common pcbcommon polygon bitmaps kbool ${wxWidgets_LIBRARIES})
install(TARGETS gerbview install(TARGETS gerbview
......
gerbview/makefile.macosx deleted 100644 → 0
View file @ fb25b5c4
## 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
View file @ a6278c25
...@@ -25,9 +25,11 @@ if(WIN32) ...@@ -25,9 +25,11 @@ if(WIN32)
endif(WIN32) endif(WIN32)
if(APPLE) 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" set_source_files_properties("${CMAKE_CURRENT_SOURCE_DIR}/kicad.icns"
PROPERTIES MACOSX_PACKAGE_LOCATION Resources) 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_ICON_FILE kicad.icns)
set(MACOSX_BUNDLE_GUI_IDENTIFIER org.kicad-eda.kicad) set(MACOSX_BUNDLE_GUI_IDENTIFIER org.kicad-eda.kicad)
set(MACOSX_BUNDLE_NAME kicad) set(MACOSX_BUNDLE_NAME kicad)
...@@ -35,6 +37,10 @@ endif(APPLE) ...@@ -35,6 +37,10 @@ endif(APPLE)
add_executable(kicad WIN32 MACOSX_BUNDLE ${KICAD_SRCS} ${KICAD_EXTRA_SRCS} ${KICAD_RESOURCES}) 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}) target_link_libraries(kicad common bitmaps ${wxWidgets_LIBRARIES})
install(TARGETS kicad install(TARGETS kicad
......
kicad/makefile.macosx deleted 100644 → 0
View file @ fb25b5c4
## 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 deleted 100644 → 0
View file @ fb25b5c4
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 deleted 100644 → 0
View file @ fb25b5c4
<pkg-contents spec="1.12"/>
\ No newline at end of file
osx-package/osx-package.pmdoc/01cvpcb.xml deleted 100644 → 0
View file @ fb25b5c4
<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>
\ No newline at end of file
osx-package/osx-package.pmdoc/02eeschema-contents.xml deleted 100644 → 0
View file @ fb25b5c4
<pkg-contents spec="1.12"/>
\ No newline at end of file
osx-package/osx-package.pmdoc/02eeschema.xml deleted 100644 → 0
View file @ fb25b5c4
<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>
\ No newline at end of file
osx-package/osx-package.pmdoc/03pcbnew-contents.xml deleted 100644 → 0
View file @ fb25b5c4
<pkg-contents spec="1.12"/>
\ No newline at end of file
osx-package/osx-package.pmdoc/03pcbnew.xml deleted 100644 → 0
View file @ fb25b5c4
<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>
\ No newline at end of file
osx-package/osx-package.pmdoc/04kicad-contents.xml deleted 100644 → 0
View file @ fb25b5c4
<pkg-contents spec="1.12"/>
\ No newline at end of file
osx-package/osx-package.pmdoc/04kicad.xml deleted 100644 → 0
View file @ fb25b5c4
<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>
\ No newline at end of file
osx-package/osx-package.pmdoc/05gerbview-contents.xml deleted 100644 → 0
View file @ fb25b5c4
<pkg-contents spec="1.12"/>
\ No newline at end of file
osx-package/osx-package.pmdoc/05gerbview.xml deleted 100644 → 0
View file @ fb25b5c4
<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>
\ No newline at end of file
osx-package/osx-package.pmdoc/06demos-contents.xml deleted 100644 → 0
View file @ fb25b5c4
<pkg-contents spec="1.12"><f n="demos" o="root" g="admin" p="16893" pt="/Users/marco/Development/kicad/kicad-source/demos" m="true" t="file"><f n=".svn" o="root" g="admin" p="16893"><f n="all-wcprops" o="root" g="admin" p="33204"><mod>mode</mod></f><f n="entries" o="root" g="admin" p="33204"><mod>mode</mod></f><f n="format" o="root" g="admin" p="33204"><mod>mode</mod></f><f n="prop-base" o="root" g="admin" p="16893"><f n="CMakeLists.txt.svn-base" o="root" g="admin" p="33204"><mod>mode</mod></f><mod>mode</mod></f><f n="props" o="root" g="admin" p="16893"><mod>mode</mod></f><f n="text-base" o="root" g="admin" p="16893"><f n="CMakeLists.txt.svn-base" o="root" g="admin" p="33204"><mod>mode</mod></f><mod>mode</mod></f><f n="tmp" o="root" g="admin" p="16893"><f n="prop-base" o="root" g="admin" p="16893"><mod>mode</mod></f><f n="props" o="root" g="admin" p="16893"><mod>mode</mod></f><f n="text-base" o="root" g="admin" p="16893"><mod>mode</mod></f><mod>mode</mod></f><mod>mode</mod></f><f n="cmake_install.cmake" o="root" g="admin" p="33204"/><f n="CMakeFiles" o="root" g="admin" p="16893"><f n="CMakeDirectoryInformation.cmake" o="root" g="admin" p="33204"/><f n="progress.make" o="root" g="admin" p="33204"/></f><f n="CMakeLists.txt" o="root" g="admin" p="33204"/><f n="ecc83" o="root" g="admin" p="16893"><f n=".svn" o="root" g="admin" p="16893"><f n="all-wcprops" o="root" g="admin" p="33204"><mod>mode</mod></f><f n="entries" o="root" g="admin" p="33204"><mod>mode</mod></f><f n="format" o="root" g="admin" p="33204"><mod>mode</mod></f><f n="prop-base" o="root" g="admin" p="16893"><f n="ecc83-pp.brd.svn-base" o="root" g="admin" p="33204"><mod>mode</mod></f><f n="ecc83-pp.cache.lib.svn-base" o="root" g="admin" p="33204"><mod>mode</mod></f><f n="ecc83-pp.cmp.svn-base" o="root" g="admin" p="33204"><mod>mode</mod></f><f n="ecc83-pp.net.svn-base" o="root" g="admin" p="33204"><mod>mode</mod></f><f n="ecc83-pp.pro.svn-base" o="root" g="admin" p="33204"><mod>mode</mod></f><f n="ecc83-pp.sch.svn-base" o="root" g="admin" p="33204"><mod>mode</mod></f><f n="ecc83-pp_v2.brd.svn-base" o="root" g="admin" p="33204"><mod>mode</mod></f><f n="ecc83-pp_v2.pro.svn-base" o="root" g="admin" p="33204"><mod>mode</mod></f><f n="ecc83-pp_v2.sch.svn-base" o="root" g="admin" p="33204"><mod>mode</mod></f><mod>mode</mod></f><f n="props" o="root" g="admin" p="16893"><mod>mode</mod></f><f n="text-base" o="root" g="admin" p="16893"><f n="ecc83-pp.brd.svn-base" o="root" g="admin" p="33204"><mod>mode</mod></f><f n="ecc83-pp.cache.lib.svn-base" o="root" g="admin" p="33204"><mod>mode</mod></f><f n="ecc83-pp.cmp.svn-base" o="root" g="admin" p="33204"><mod>mode</mod></f><f n="ecc83-pp.net.svn-base" o="root" g="admin" p="33204"><mod>mode</mod></f><f n="ecc83-pp.pro.svn-base" o="root" g="admin" p="33204"><mod>mode</mod></f><f n="ecc83-pp.sch.svn-base" o="root" g="admin" p="33204"><mod>mode</mod></f><f n="ecc83-pp_v2.brd.svn-base" o="root" g="admin" p="33204"><mod>mode</mod></f><f n="ecc83-pp_v2.pro.svn-base" o="root" g="admin" p="33204"><mod>mode</mod></f><f n="ecc83-pp_v2.sch.svn-base" o="root" g="admin" p="33204"><mod>mode</mod></f><mod>mode</mod></f><f n="tmp" o="root" g="admin" p="16893"><f n="prop-base" o="root" g="admin" p="16893"><mod>mode</mod></f><f n="props" o="root" g="admin" p="16893"><mod>mode</mod></f><f n="text-base" o="root" g="admin" p="16893"><mod>mode</mod></f><mod>mode</mod></f><mod>mode</mod></f><f n="ecc83-pp.brd" o="root" g="admin" p="33204"/><f n="ecc83-pp.cache.lib" o="root" g="admin" p="33204"/><f n="ecc83-pp.cmp" o="root" g="admin" p="33204"/><f n="ecc83-pp.net" o="root" g="admin" p="33204"/><f n="ecc83-pp.pro" o="root" g="admin" p="33204"/><f n="ecc83-pp.sch" o="root" g="admin" p="33204"/><f n="ecc83-pp_v2.brd" o="root" g="admin" p="33204"/><f n="ecc83-pp_v2.pro" o="root" g="admin" p="33204"/><f n="ecc83-pp_v2.sch" o="root" g="admin" p="33204"/></f><f n="electric" o="root" g="admin" p="16893"><f n=".svn" o="root" g="admin" p="16893"><f n="all-wcprops" o="root" g="admin" p="33204"><mod>mode</mod></f><f n="entries" o="root" g="admin" p="33204"><mod>mode</mod></f><f n="format" o="root" g="admin" p="33204"><mod>mode</mod></f><f n="prop-base" o="root" g="admin" p="16893"><f n="electric.cache.lib.svn-base" o="root" g="admin" p="33204"><mod>mode</mod></f><f n="electric.pro.svn-base" o="root" g="admin" p="33204"><mod>mode</mod></f><f n="electric.sch.svn-base" o="root" g="admin" p="33204"><mod>mode</mod></f><mod>mode</mod></f><f n="props" o="root" g="admin" p="16893"><mod>mode</mod></f><f n="text-base" o="root" g="admin" p="16893"><f n="electric.cache.lib.svn-base" o="root" g="admin" p="33204"><mod>mode</mod></f><f n="electric.pro.svn-base" o="root" g="admin" p="33204"><mod>mode</mod></f><f n="electric.sch.svn-base" o="root" g="admin" p="33204"><mod>mode</mod></f><mod>mode</mod></f><f n="tmp" o="root" g="admin" p="16893"><f n="prop-base" o="root" g="admin" p="16893"><mod>mode</mod></f><f n="props" o="root" g="admin" p="16893"><mod>mode</mod></f><f n="text-base" o="root" g="admin" p="16893"><mod>mode</mod></f><mod>mode</mod></f><mod>mode</mod></f><f n="electric.cache.lib" o="root" g="admin" p="33204"/><f n="electric.pro" o="root" g="admin" p="33204"/><f n="electric.sch" o="root" g="admin" p="33204"/></f><f n="flat_hierarchy" o="root" g="admin" p="16893"><f n=".svn" o="root" g="admin" p="16893"><f n="all-wcprops" o="root" g="admin" p="33204"><mod>mode</mod></f><f n="entries" o="root" g="admin" p="33204"><mod>mode</mod></f><f n="format" o="root" g="admin" p="33204"><mod>mode</mod></f><f n="prop-base" o="root" g="admin" p="16893"><f n="flat_hierarchy.brd.svn-base" o="root" g="admin" p="33204"><mod>mode</mod></f><f n="flat_hierarchy.cache.lib.svn-base" o="root" g="admin" p="33204"><mod>mode</mod></f><f n="flat_hierarchy.cmp.svn-base" o="root" g="admin" p="33204"><mod>mode</mod></f><f n="flat_hierarchy.net.svn-base" o="root" g="admin" p="33204"><mod>mode</mod></f><f n="flat_hierarchy.pro.svn-base" o="root" g="admin" p="33204"><mod>mode</mod></f><f n="flat_hierarchy.sch.svn-base" o="root" g="admin" p="33204"><mod>mode</mod></f><f n="pic_programmer.sch.svn-base" o="root" g="admin" p="33204"><mod>mode</mod></f><f n="pic_sockets.sch.svn-base" o="root" g="admin" p="33204"><mod>mode</mod></f><mod>mode</mod></f><f n="props" o="root" g="admin" p="16893"><mod>mode</mod></f><f n="text-base" o="root" g="admin" p="16893"><f n="flat_hierarchy.brd.svn-base" o="root" g="admin" p="33204"><mod>mode</mod></f><f n="flat_hierarchy.cache.lib.svn-base" o="root" g="admin" p="33204"><mod>mode</mod></f><f n="flat_hierarchy.cmp.svn-base" o="root" g="admin" p="33204"><mod>mode</mod></f><f n="flat_hierarchy.net.svn-base" o="root" g="admin" p="33204"><mod>mode</mod></f><f n="flat_hierarchy.pro.svn-base" o="root" g="admin" p="33204"><mod>mode</mod></f><f n="flat_hierarchy.sch.svn-base" o="root" g="admin" p="33204"><mod>mode</mod></f><f n="pic_programmer.sch.svn-base" o="root" g="admin" p="33204"><mod>mode</mod></f><f n="pic_sockets.sch.svn-base" o="root" g="admin" p="33204"><mod>mode</mod></f><mod>mode</mod></f><f n="tmp" o="root" g="admin" p="16893"><f n="prop-base" o="root" g="admin" p="16893"><mod>mode</mod></f><f n="props" o="root" g="admin" p="16893"><mod>mode</mod></f><f n="text-base" o="root" g="admin" p="16893"><mod>mode</mod></f><mod>mode</mod></f><mod>mode</mod></f><f n="flat_hierarchy.brd" o="root" g="admin" p="33204"/><f n="flat_hierarchy.cache.lib" o="root" g="admin" p="33204"/><f n="flat_hierarchy.cmp" o="root" g="admin" p="33204"/><f n="flat_hierarchy.net" o="root" g="admin" p="33204"/><f n="flat_hierarchy.pro" o="root" g="admin" p="33204"/><f n="flat_hierarchy.sch" o="root" g="admin" p="33204"/><f n="pic_programmer.sch" o="root" g="admin" p="33204"/><f n="pic_sockets.sch" o="root" g="admin" p="33204"/></f><f n="interf_u" o="root" g="admin" p="16893"><f n=".svn" o="root" g="admin" p="16893"><f n="all-wcprops" o="root" g="admin" p="33204"><mod>mode</mod></f><f n="entries" o="root" g="admin" p="33204"><mod>mode</mod></f><f n="format" o="root" g="admin" p="33204"><mod>mode</mod></f><f n="prop-base" o="root" g="admin" p="16893"><f n="interf_u.brd.svn-base" o="root" g="admin" p="33204"><mod>mode</mod></f><f n="interf_u.cache.lib.svn-base" o="root" g="admin" p="33204"><mod>mode</mod></f><f n="interf_u.cmp.svn-base" o="root" g="admin" p="33204"><mod>mode</mod></f><f n="interf_u.net.svn-base" o="root" g="admin" p="33204"><mod>mode</mod></f><f n="interf_u.pro.svn-base" o="root" g="admin" p="33204"><mod>mode</mod></f><f n="interf_u.sch.svn-base" o="root" g="admin" p="33204"><mod>mode</mod></f><mod>mode</mod></f><f n="props" o="root" g="admin" p="16893"><mod>mode</mod></f><f n="text-base" o="root" g="admin" p="16893"><f n="interf_u.brd.svn-base" o="root" g="admin" p="33204"><mod>mode</mod></f><f n="interf_u.cache.lib.svn-base" o="root" g="admin" p="33204"><mod>mode</mod></f><f n="interf_u.cmp.svn-base" o="root" g="admin" p="33204"><mod>mode</mod></f><f n="interf_u.net.svn-base" o="root" g="admin" p="33204"><mod>mode</mod></f><f n="interf_u.pro.svn-base" o="root" g="admin" p="33204"><mod>mode</mod></f><f n="interf_u.sch.svn-base" o="root" g="admin" p="33204"><mod>mode</mod></f><mod>mode</mod></f><f n="tmp" o="root" g="admin" p="16893"><f n="prop-base" o="root" g="admin" p="16893"><mod>mode</mod></f><f n="props" o="root" g="admin" p="16893"><mod>mode</mod></f><f n="text-base" o="root" g="admin" p="16893"><mod>mode</mod></f><mod>mode</mod></f><mod>mode</mod></f><f n="interf_u.brd" o="root" g="admin" p="33204"/><f n="interf_u.cache.lib" o="root" g="admin" p="33204"/><f n="interf_u.cmp" o="root" g="admin" p="33204"/><f n="interf_u.net" o="root" g="admin" p="33204"/><f n="interf_u.pro" o="root" g="admin" p="33204"/><f n="interf_u.sch" o="root" g="admin" p="33204"/></f><f n="kit-dev-coldfire-xilinx_5213" o="root" g="admin" p="16893"><f n=".svn" o="root" g="admin" p="16893"><f n="all-wcprops" o="root" g="admin" p="33204"><mod>mode</mod></f><f n="entries" o="root" g="admin" p="33204"><mod>mode</mod></f><f n="format" o="root" g="admin" p="33204"><mod>mode</mod></f><f n="prop-base" o="root" g="admin" p="16893"><f n="in_out_conn.sch.svn-base" o="root" g="admin" p="33204"><mod>mode</mod></f><f n="kit-dev-coldfire-xilinx_5213.brd.svn-base" o="root" g="admin" p="33204"><mod>mode</mod></f><f n="kit-dev-coldfire-xilinx_5213.cache.lib.svn-base" o="root" g="admin" p="33204"><mod>mode</mod></f><f n="kit-dev-coldfire-xilinx_5213.cmp.svn-base" o="root" g="admin" p="33204"><mod>mode</mod></f><f n="kit-dev-coldfire-xilinx_5213.net.svn-base" o="root" g="admin" p="33204"><mod>mode</mod></f><f n="kit-dev-coldfire-xilinx_5213.pro.svn-base" o="root" g="admin" p="33204"><mod>mode</mod></f><f n="kit-dev-coldfire-xilinx_5213.sch.svn-base" o="root" g="admin" p="33204"><mod>mode</mod></f><f n="xilinx.sch.svn-base" o="root" g="admin" p="33204"><mod>mode</mod></f><mod>mode</mod></f><f n="props" o="root" g="admin" p="16893"><mod>mode</mod></f><f n="text-base" o="root" g="admin" p="16893"><f n="in_out_conn.sch.svn-base" o="root" g="admin" p="33204"><mod>mode</mod></f><f n="kit-dev-coldfire-xilinx_5213.brd.svn-base" o="root" g="admin" p="33204"><mod>mode</mod></f><f n="kit-dev-coldfire-xilinx_5213.cache.lib.svn-base" o="root" g="admin" p="33204"><mod>mode</mod></f><f n="kit-dev-coldfire-xilinx_5213.cmp.svn-base" o="root" g="admin" p="33204"><mod>mode</mod></f><f n="kit-dev-coldfire-xilinx_5213.net.svn-base" o="root" g="admin" p="33204"><mod>mode</mod></f><f n="kit-dev-coldfire-xilinx_5213.pro.svn-base" o="root" g="admin" p="33204"><mod>mode</mod></f><f n="kit-dev-coldfire-xilinx_5213.sch.svn-base" o="root" g="admin" p="33204"><mod>mode</mod></f><f n="xilinx.sch.svn-base" o="root" g="admin" p="33204"><mod>mode</mod></f><mod>mode</mod></f><f n="tmp" o="root" g="admin" p="16893"><f n="prop-base" o="root" g="admin" p="16893"><mod>mode</mod></f><f n="props" o="root" g="admin" p="16893"><mod>mode</mod></f><f n="text-base" o="root" g="admin" p="16893"><mod>mode</mod></f><mod>mode</mod></f><mod>mode</mod></f><f n="in_out_conn.sch" o="root" g="admin" p="33204"/><f n="kit-dev-coldfire-xilinx_5213.brd" o="root" g="admin" p="33204"/><f n="kit-dev-coldfire-xilinx_5213.cache.lib" o="root" g="admin" p="33204"/><f n="kit-dev-coldfire-xilinx_5213.cmp" o="root" g="admin" p="33204"/><f n="kit-dev-coldfire-xilinx_5213.net" o="root" g="admin" p="33204"/><f n="kit-dev-coldfire-xilinx_5213.pro" o="root" g="admin" p="33204"/><f n="kit-dev-coldfire-xilinx_5213.sch" o="root" g="admin" p="33204"/><f n="xilinx.sch" o="root" g="admin" p="33204"/></f><f n="Makefile" o="root" g="admin" p="33204"/><f n="microwave" o="root" g="admin" p="16893"><f n=".svn" o="root" g="admin" p="16893"><f n="all-wcprops" o="root" g="admin" p="33204"><mod>mode</mod></f><f n="entries" o="root" g="admin" p="33204"><mod>mode</mod></f><f n="format" o="root" g="admin" p="33204"><mod>mode</mod></f><f n="prop-base" o="root" g="admin" p="16893"><f n="microwave.brd.svn-base" o="root" g="admin" p="33204"><mod>mode</mod></f><f n="microwave.pro.svn-base" o="root" g="admin" p="33204"><mod>mode</mod></f><f n="shape1.txt.svn-base" o="root" g="admin" p="33204"><mod>mode</mod></f><mod>mode</mod></f><f n="props" o="root" g="admin" p="16893"><mod>mode</mod></f><f n="text-base" o="root" g="admin" p="16893"><f n="microwave.brd.svn-base" o="root" g="admin" p="33204"><mod>mode</mod></f><f n="microwave.pro.svn-base" o="root" g="admin" p="33204"><mod>mode</mod></f><f n="shape1.txt.svn-base" o="root" g="admin" p="33204"><mod>mode</mod></f><mod>mode</mod></f><f n="tmp" o="root" g="admin" p="16893"><f n="prop-base" o="root" g="admin" p="16893"><mod>mode</mod></f><f n="props" o="root" g="admin" p="16893"><mod>mode</mod></f><f n="text-base" o="root" g="admin" p="16893"><mod>mode</mod></f><mod>mode</mod></f><mod>mode</mod></f><f n="microwave.brd" o="root" g="admin" p="33204"/><f n="microwave.pro" o="root" g="admin" p="33204"/><f n="shape1.txt" o="root" g="admin" p="33204"/></f><f n="pic_programmer" o="root" g="admin" p="16893"><f n=".svn" o="root" g="admin" p="16893"><f n="all-wcprops" o="root" g="admin" p="33204"><mod>mode</mod></f><f n="entries" o="root" g="admin" p="33204"><mod>mode</mod></f><f n="format" o="root" g="admin" p="33204"><mod>mode</mod></f><f n="prop-base" o="root" g="admin" p="16893"><f n="pic_programmer.brd.svn-base" o="root" g="admin" p="33204"><mod>mode</mod></f><f n="pic_programmer.cache.lib.svn-base" o="root" g="admin" p="33204"><mod>mode</mod></f><f n="pic_programmer.cmp.svn-base" o="root" g="admin" p="33204"><mod>mode</mod></f><f n="pic_programmer.net.svn-base" o="root" g="admin" p="33204"><mod>mode</mod></f><f n="pic_programmer.pro.svn-base" o="root" g="admin" p="33204"><mod>mode</mod></f><f n="pic_programmer.sch.svn-base" o="root" g="admin" p="33204"><mod>mode</mod></f><f n="pic_sockets.sch.svn-base" o="root" g="admin" p="33204"><mod>mode</mod></f><mod>mode</mod></f><f n="props" o="root" g="admin" p="16893"><mod>mode</mod></f><f n="text-base" o="root" g="admin" p="16893"><f n="pic_programmer.brd.svn-base" o="root" g="admin" p="33204"><mod>mode</mod></f><f n="pic_programmer.cache.lib.svn-base" o="root" g="admin" p="33204"><mod>mode</mod></f><f n="pic_programmer.cmp.svn-base" o="root" g="admin" p="33204"><mod>mode</mod></f><f n="pic_programmer.net.svn-base" o="root" g="admin" p="33204"><mod>mode</mod></f><f n="pic_programmer.pro.svn-base" o="root" g="admin" p="33204"><mod>mode</mod></f><f n="pic_programmer.sch.svn-base" o="root" g="admin" p="33204"><mod>mode</mod></f><f n="pic_sockets.sch.svn-base" o="root" g="admin" p="33204"><mod>mode</mod></f><mod>mode</mod></f><f n="tmp" o="root" g="admin" p="16893"><f n="prop-base" o="root" g="admin" p="16893"><mod>mode</mod></f><f n="props" o="root" g="admin" p="16893"><mod>mode</mod></f><f n="text-base" o="root" g="admin" p="16893"><mod>mode</mod></f><mod>mode</mod></f><mod>mode</mod></f><f n="pic_programmer.brd" o="root" g="admin" p="33204"/><f n="pic_programmer.cache.lib" o="root" g="admin" p="33204"/><f n="pic_programmer.cmp" o="root" g="admin" p="33204"/><f n="pic_programmer.net" o="root" g="admin" p="33204"/><f n="pic_programmer.pro" o="root" g="admin" p="33204"/><f n="pic_programmer.sch" o="root" g="admin" p="33204"/><f n="pic_sockets.sch" o="root" g="admin" p="33204"/></f><f n="pspice" o="root" g="admin" p="16893"><f n=".svn" o="root" g="admin" p="16893"><f n="all-wcprops" o="root" g="admin" p="33204"><mod>mode</mod></f><f n="entries" o="root" g="admin" p="33204"><mod>mode</mod></f><f n="format" o="root" g="admin" p="33204"><mod>mode</mod></f><f n="prop-base" o="root" g="admin" p="16893"><f n="pspice.cache.lib.svn-base" o="root" g="admin" p="33204"><mod>mode</mod></f><f n="pspice.cir.svn-base" o="root" g="admin" p="33204"><mod>mode</mod></f><f n="pspice.pro.svn-base" o="root" g="admin" p="33204"><mod>mode</mod></f><f n="pspice.sch.svn-base" o="root" g="admin" p="33204"><mod>mode</mod></f><mod>mode</mod></f><f n="props" o="root" g="admin" p="16893"><mod>mode</mod></f><f n="text-base" o="root" g="admin" p="16893"><f n="pspice.cache.lib.svn-base" o="root" g="admin" p="33204"><mod>mode</mod></f><f n="pspice.cir.svn-base" o="root" g="admin" p="33204"><mod>mode</mod></f><f n="pspice.pro.svn-base" o="root" g="admin" p="33204"><mod>mode</mod></f><f n="pspice.sch.svn-base" o="root" g="admin" p="33204"><mod>mode</mod></f><mod>mode</mod></f><f n="tmp" o="root" g="admin" p="16893"><f n="prop-base" o="root" g="admin" p="16893"><mod>mode</mod></f><f n="props" o="root" g="admin" p="16893"><mod>mode</mod></f><f n="text-base" o="root" g="admin" p="16893"><mod>mode</mod></f><mod>mode</mod></f><mod>mode</mod></f><f n="pspice.cache.lib" o="root" g="admin" p="33204"/><f n="pspice.cir" o="root" g="admin" p="33204"/><f n="pspice.pro" o="root" g="admin" p="33204"/><f n="pspice.sch" o="root" g="admin" p="33204"/></f><f n="sonde xilinx" o="root" g="admin" p="16893"><f n=".svn" o="root" g="admin" p="16893"><f n="all-wcprops" o="root" g="admin" p="33204"><mod>mode</mod></f><f n="entries" o="root" g="admin" p="33204"><mod>mode</mod></f><f n="format" o="root" g="admin" p="33204"><mod>mode</mod></f><f n="prop-base" o="root" g="admin" p="16893"><f n="sonde xilinx.brd.svn-base" o="root" g="admin" p="33204"><mod>mode</mod></f><f n="sonde xilinx.cache.lib.svn-base" o="root" g="admin" p="33204"><mod>mode</mod></f><f n="sonde xilinx.cmp.svn-base" o="root" g="admin" p="33204"><mod>mode</mod></f><f n="sonde xilinx.drl.svn-base" o="root" g="admin" p="33204"><mod>mode</mod></f><f n="sonde xilinx.net.svn-base" o="root" g="admin" p="33204"><mod>mode</mod></f><f n="sonde xilinx.pro.svn-base" o="root" g="admin" p="33204"><mod>mode</mod></f><f n="sonde xilinx.sch.svn-base" o="root" g="admin" p="33204"><mod>mode</mod></f><mod>mode</mod></f><f n="props" o="root" g="admin" p="16893"><mod>mode</mod></f><f n="text-base" o="root" g="admin" p="16893"><f n="sonde xilinx.brd.svn-base" o="root" g="admin" p="33204"><mod>mode</mod></f><f n="sonde xilinx.cache.lib.svn-base" o="root" g="admin" p="33204"><mod>mode</mod></f><f n="sonde xilinx.cmp.svn-base" o="root" g="admin" p="33204"><mod>mode</mod></f><f n="sonde xilinx.drl.svn-base" o="root" g="admin" p="33204"><mod>mode</mod></f><f n="sonde xilinx.net.svn-base" o="root" g="admin" p="33204"><mod>mode</mod></f><f n="sonde xilinx.pro.svn-base" o="root" g="admin" p="33204"><mod>mode</mod></f><f n="sonde xilinx.sch.svn-base" o="root" g="admin" p="33204"><mod>mode</mod></f><mod>mode</mod></f><f n="tmp" o="root" g="admin" p="16893"><f n="prop-base" o="root" g="admin" p="16893"><mod>mode</mod></f><f n="props" o="root" g="admin" p="16893"><mod>mode</mod></f><f n="text-base" o="root" g="admin" p="16893"><mod>mode</mod></f><mod>mode</mod></f><mod>mode</mod></f><f n="sonde xilinx.brd" o="root" g="admin" p="33204"/><f n="sonde xilinx.cache.lib" o="root" g="admin" p="33204"/><f n="sonde xilinx.cmp" o="root" g="admin" p="33204"/><f n="sonde xilinx.drl" o="root" g="admin" p="33204"/><f n="sonde xilinx.net" o="root" g="admin" p="33204"/><f n="sonde xilinx.pro" o="root" g="admin" p="33204"/><f n="sonde xilinx.sch" o="root" g="admin" p="33204"/></f><f n="test_xil_95108" o="root" g="admin" p="16893"><f n=".svn" o="root" g="admin" p="16893"><f n="all-wcprops" o="root" g="admin" p="33204"><mod>mode</mod></f><f n="entries" o="root" g="admin" p="33204"><mod>mode</mod></f><f n="format" o="root" g="admin" p="33204"><mod>mode</mod></f><f n="prop-base" o="root" g="admin" p="16893"><f n="carte_test.brd.svn-base" o="root" g="admin" p="33204"><mod>mode</mod></f><f n="carte_test.cache.lib.svn-base" o="root" g="admin" p="33204"><mod>mode</mod></f><f n="carte_test.cmp.svn-base" o="root" g="admin" p="33204"><mod>mode</mod></f><f n="carte_test.net.svn-base" o="root" g="admin" p="33204"><mod>mode</mod></f><f n="carte_test.pro.svn-base" o="root" g="admin" p="33204"><mod>mode</mod></f><f n="carte_test.sch.svn-base" o="root" g="admin" p="33204"><mod>mode</mod></f><mod>mode</mod></f><f n="props" o="root" g="admin" p="16893"><mod>mode</mod></f><f n="text-base" o="root" g="admin" p="16893"><f n="carte_test.brd.svn-base" o="root" g="admin" p="33204"><mod>mode</mod></f><f n="carte_test.cache.lib.svn-base" o="root" g="admin" p="33204"><mod>mode</mod></f><f n="carte_test.cmp.svn-base" o="root" g="admin" p="33204"><mod>mode</mod></f><f n="carte_test.net.svn-base" o="root" g="admin" p="33204"><mod>mode</mod></f><f n="carte_test.pro.svn-base" o="root" g="admin" p="33204"><mod>mode</mod></f><f n="carte_test.sch.svn-base" o="root" g="admin" p="33204"><mod>mode</mod></f><mod>mode</mod></f><f n="tmp" o="root" g="admin" p="16893"><f n="prop-base" o="root" g="admin" p="16893"><mod>mode</mod></f><f n="props" o="root" g="admin" p="16893"><mod>mode</mod></f><f n="text-base" o="root" g="admin" p="16893"><mod>mode</mod></f><mod>mode</mod></f><mod>mode</mod></f><f n="carte_test.brd" o="root" g="admin" p="33204"/><f n="carte_test.cache.lib" o="root" g="admin" p="33204"/><f n="carte_test.cmp" o="root" g="admin" p="33204"/><f n="carte_test.net" o="root" g="admin" p="33204"/><f n="carte_test.pro" o="root" g="admin" p="33204"/><f n="carte_test.sch" o="root" g="admin" p="33204"/></f><f n="video" o="root" g="admin" p="16893"><f n=".svn" o="root" g="admin" p="16893"><f n="all-wcprops" o="root" g="admin" p="33204"><mod>mode</mod></f><f n="entries" o="root" g="admin" p="33204"><mod>mode</mod></f><f n="format" o="root" g="admin" p="33204"><mod>mode</mod></f><f n="prop-base" o="root" g="admin" p="16893"><f n="bus_pci.sch.svn-base" o="root" g="admin" p="33204"><mod>mode</mod></f><f n="esvideo.sch.svn-base" o="root" g="admin" p="33204"><mod>mode</mod></f><f n="graphic.sch.svn-base" o="root" g="admin" p="33204"><mod>mode</mod></f><f n="modul.sch.svn-base" o="root" g="admin" p="33204"><mod>mode</mod></f><f n="muxdata.sch.svn-base" o="root" g="admin" p="33204"><mod>mode</mod></f><f n="pal-ntsc.sch.svn-base" o="root" g="admin" p="33204"><mod>mode</mod></f><f n="rams.sch.svn-base" o="root" g="admin" p="33204"><mod>mode</mod></f><f n="video.brd.svn-base" o="root" g="admin" p="33204"><mod>mode</mod></f><f n="video.cache.lib.svn-base" o="root" g="admin" p="33204"><mod>mode</mod></f><f n="video.cmp.svn-base" o="root" g="admin" p="33204"><mod>mode</mod></f><f n="video.net.svn-base" o="root" g="admin" p="33204"><mod>mode</mod></f><f n="video.pro.svn-base" o="root" g="admin" p="33204"><mod>mode</mod></f><f n="video.sch.svn-base" o="root" g="admin" p="33204"><mod>mode</mod></f><mod>mode</mod></f><f n="props" o="root" g="admin" p="16893"><mod>mode</mod></f><f n="text-base" o="root" g="admin" p="16893"><f n="bus_pci.sch.svn-base" o="root" g="admin" p="33204"><mod>mode</mod></f><f n="esvideo.sch.svn-base" o="root" g="admin" p="33204"><mod>mode</mod></f><f n="graphic.sch.svn-base" o="root" g="admin" p="33204"><mod>mode</mod></f><f n="modul.sch.svn-base" o="root" g="admin" p="33204"><mod>mode</mod></f><f n="muxdata.sch.svn-base" o="root" g="admin" p="33204"><mod>mode</mod></f><f n="pal-ntsc.sch.svn-base" o="root" g="admin" p="33204"><mod>mode</mod></f><f n="rams.sch.svn-base" o="root" g="admin" p="33204"><mod>mode</mod></f><f n="video.brd.svn-base" o="root" g="admin" p="33204"><mod>mode</mod></f><f n="video.cache.lib.svn-base" o="root" g="admin" p="33204"><mod>mode</mod></f><f n="video.cmp.svn-base" o="root" g="admin" p="33204"><mod>mode</mod></f><f n="video.net.svn-base" o="root" g="admin" p="33204"><mod>mode</mod></f><f n="video.pro.svn-base" o="root" g="admin" p="33204"><mod>mode</mod></f><f n="video.sch.svn-base" o="root" g="admin" p="33204"><mod>mode</mod></f><mod>mode</mod></f><f n="tmp" o="root" g="admin" p="16893"><f n="prop-base" o="root" g="admin" p="16893"><mod>mode</mod></f><f n="props" o="root" g="admin" p="16893"><mod>mode</mod></f><f n="text-base" o="root" g="admin" p="16893"><mod>mode</mod></f><mod>mode</mod></f><mod>mode</mod></f><f n="bus_pci.sch" o="root" g="admin" p="33204"/><f n="esvideo.sch" o="root" g="admin" p="33204"/><f n="graphic.sch" o="root" g="admin" p="33204"/><f n="modul.sch" o="root" g="admin" p="33204"/><f n="muxdata.sch" o="root" g="admin" p="33204"/><f n="pal-ntsc.sch" o="root" g="admin" p="33204"/><f n="rams.sch" o="root" g="admin" p="33204"/><f n="video.brd" o="root" g="admin" p="33204"/><f n="video.cache.lib" o="root" g="admin" p="33204"/><f n="video.cmp" o="root" g="admin" p="33204"/><f n="video.net" o="root" g="admin" p="33204"/><f n="video.pro" o="root" g="admin" p="33204"/><f n="video.sch" o="root" g="admin" p="33204"/></f></f></pkg-contents>
\ No newline at end of file
osx-package/osx-package.pmdoc/06demos.xml deleted 100644 → 0
View file @ fb25b5c4
<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>
\ No newline at end of file
osx-package/osx-package.pmdoc/index.xml deleted 100644 → 0
View file @ fb25b5c4
<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>
\ No newline at end of file
pcbnew/CMakeLists.txt
View file @ a6278c25
...@@ -162,16 +162,23 @@ if(WIN32) ...@@ -162,16 +162,23 @@ if(WIN32)
endif(WIN32) endif(WIN32)
if(APPLE) 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" set_source_files_properties("${CMAKE_CURRENT_SOURCE_DIR}/pcbnew.icns"
PROPERTIES MACOSX_PACKAGE_LOCATION Resources) 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_ICON_FILE pcbnew.icns)
set(MACOSX_BUNDLE_GUI_IDENTIFIER org.kicad-eda.pcbnew) set(MACOSX_BUNDLE_GUI_IDENTIFIER org.kicad-eda.pcbnew)
set(MACOSX_BUNDLE_NAME pcbnew) set(MACOSX_BUNDLE_NAME pcbnew)
set(MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist)
endif(APPLE) endif(APPLE)
add_executable(pcbnew WIN32 MACOSX_BUNDLE ${PCBNEW_SRCS} ${PCBNEW_EXTRA_SRCS} ${PCBNEW_RESOURCES}) 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}) target_link_libraries(pcbnew 3d-viewer common pcbcommon polygon bitmaps kbool ${wxWidgets_LIBRARIES} ${OPENGL_LIBRARIES})
install(TARGETS pcbnew install(TARGETS pcbnew
......
pcbnew/makefile.macosx deleted 100644 → 0
View file @ fb25b5c4
## 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)
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