Commit 05e69660 authored by CHARRAS's avatar CHARRAS
Browse files

minor changes before creating a stable version

parent 5017812e
Loading
Loading
Loading
Loading
+15 −10
Original line number Original line Diff line number Diff line
How to build kicad:
How to build kicad:


kicad do not use configure (not yet...)
kicad do not use configure (Use of Cmake is in progress)
it is compiled with make.
it is compiled with make.


kicad needs wxWidgets (the multi platform G.U.I.)
kicad needs wxWidgets (the multi platform G.U.I.)
@@ -31,14 +31,20 @@ make install ( libGL.a et libGLU.a are copied in /usr/local/lib, and header in /


kicad compilation:
kicad compilation:
in kicad-dev:
in kicad-dev:
 Have a look to libs.linux (you can edit this file if you have problems)
 Have a look to libs.linux (you can/must edit this file if you have problems)
 Currently libs.linux uses wxWidgets 2.7.1 build (see below for suggested configure command)
 Currently libs.linux uses wxWidgets 2.8.6 build (see below for suggested configure command)
 lines to edit:
 STD_INSTALL = 1
 which can be (see comments in libs.linux)
 STD_INSTALL = 1

 after libs.linux edition:
 run make -f makefile.gtk
 run make -f makefile.gtk


Windows compilation:
Windows compilation:


kicad is build with mingw and msys.
kicad is build with mingw and msys.
Currently libs.linux uses wxWidgets 2.8.1 (see below for suggested configure command)
Currently libs.win uses wxWidgets 2.8.6 (see below for suggested configure command)


install mingw  and msys ( see mingw.org )
install mingw  and msys ( see mingw.org )
(opengl libs are included in mingw or windows)
(opengl libs are included in mingw or windows)
@@ -47,21 +53,20 @@ Under msys:
	(Warning: make.exe utility is sometime renamed mingw32-make.exe in install process
	(Warning: make.exe utility is sometime renamed mingw32-make.exe in install process
	of msys.)
	of msys.)


Build wxWidgets (currently version 2.8.1)
Build wxWidgets (currently version 2.8.6)
	See below for suggested configure command, then make
	See below for suggested configure command, then make


	In include/wx/msw/setup.h, check (and edit if needed) the defines :
	In include/wx/msw/setup.h, check (and edit if needed) the defines :
	#define wxUSE_GLCANVAS       1
	#define wxUSE_GLCANVAS       1
	#define WXWIN_COMPATIBILITY_2_4 0
	#define wxUSE_MOUSEWHEEL  1 // Include mouse wheel support
	#define wxUSE_MOUSEWHEEL  1 // Include mouse wheel support
	#define wxUSE_HOTKEY 0      // Hotkey support (currently Windows only)
	#define wxUSE_HOTKEY 0      // Hotkey support (currently Windows only)




Exit msys.
Exit msys.
Set environment variable WXWIN ( something as wxwin=/d/wxWidgets-2.8.1
Set environment variable WXWIN ( something as wxwin=/d/wxWidgets-2.8.6
for a wxWidget installed in d:\wxWidgets-2.8.1)
for a wxWidget installed in d:\wxWidgets-2.8.6)


Have a look to libs.win (Currently this file handle wxWidgets 2.8.1)
Have a look to libs.win (Currently this file handle wxWidgets 2.8.6)


Under msys:
Under msys:
	in kicad-dev:
	in kicad-dev:
@@ -101,7 +106,7 @@ Patch wxWidgets
wxGTK version:
wxGTK version:
*************************************************************************************
*************************************************************************************
Patch for printing wide traces that were showing missing rounded end caps:
Patch for printing wide traces that were showing missing rounded end caps:
wxGTK-2.8.1/src/generic/dcpsg.cpp
wxGTK-2.8.6/src/generic/dcpsg.cpp
line 1634
line 1634
	PsPrint( "%%EndProlog\n" );
	PsPrint( "%%EndProlog\n" );


+1 −1
Original line number Original line Diff line number Diff line
@@ -5,7 +5,7 @@


COMMON_GLOBL wxString g_BuildVersion
COMMON_GLOBL wxString g_BuildVersion
#ifdef EDA_BASE
#ifdef EDA_BASE
	(wxT("(2007-11-05)"))
	(wxT("(2007-11-09)"))
#endif
#endif
;
;


+167 B (131 KiB)

File changed.

No diff preview for this file type.

+784 −829

File changed.

Preview size limit exceeded, changes collapsed.

+23 −13
Original line number Original line Diff line number Diff line
@@ -2,16 +2,36 @@
# Configuration for kicad build & install
# Configuration for kicad build & install
#
#


# You must comment or uncomment this line to disable/enable python support
#KICAD_PYTHON = 1

# Locations for install targets. All can be overriden on the make command.
# Locations for install targets. All can be overriden on the make command.
# Normally you'd only expect to override the PREFIX if you want to install to
# Normally you'd only expect to override the PREFIX if you want to install to
# a non standard install dir (or a temp location for packaging).
# a non standard install dir (or a temp location for packaging).
# For packaging you can override and install anywhere, but to run from a
# For packaging you can override and install anywhere, but to run from a
# non-standard location edit common/gestfich.ccp so it knows where to
# non-standard location edit common/gestfich.ccp so it knows where to
# load help/data/etc. files from.
# load help/data/etc. files from.
# Current supported PREFIXes are /usr, /usr/local & /usr/local/kicad
# Current supported PREFIXes are /usr and /usr/local (standard install for distributions)
# and /usr/local/kicad is used when STD_INSTALL = 0 or STD_INSTALL = 2
# all kicad files will be in /usr/local/kicad
# STD_INSTALL = 2 is used only to make static link (only useful when kicad run on an other 
# linux distribution than the distributions used to compil kicad.


STD_INSTALL = 1
STD_INSTALL = 1


#*******************************************
#*******************************************

ifndef KICAD_PYTHON
ifeq ($(STD_INSTALL), 2)
KICAD_STATIC_LINK = 1
endif
endif

ifndef KICAD_STATIC_LINK
KICAD_STATIC_LINK = 0
endif

ifeq ($(STD_INSTALL), 1)
ifeq ($(STD_INSTALL), 1)
PREFIX = /usr
PREFIX = /usr
KICAD_BIN = $(PREFIX)/bin
KICAD_BIN = $(PREFIX)/bin
@@ -24,7 +44,8 @@ KICAD_INTERNAT=$(KICAD_DATA)/internat
KICAD_TEMPLATE=$(KICAD_DATA)/template
KICAD_TEMPLATE=$(KICAD_DATA)/template


else
else
# used by myself (JP Charras) to build a statically linked distribution intalled in /usr/local (with STD_INSTALL = 0)
# when STD_INSTALL = 0 or STD_INSTALL = 2
# STD_INSTALL = 2 is used by myself (JP Charras) to build a statically linked distribution intalled in /usr/local (with STD_INSTALL = 0)
PREFIX = /usr/local/kicad
PREFIX = /usr/local/kicad
KICAD_BIN = $(PREFIX)/linux
KICAD_BIN = $(PREFIX)/linux
KICAD_PLUGINS = $(KICAD_BIN)/plugins
KICAD_PLUGINS = $(KICAD_BIN)/plugins
@@ -68,17 +89,6 @@ CPPFLAGS += -DUSE_MATCH_LAYER
endif
endif




# You must comment or uncomment this line to disable/enable python support
#KICAD_PYTHON = 1

# You must uncomment these lines for static link (or build with "make -f makefile.gtk KICAD_STATIC_LINK=1")
# dynamic link is less difficult than static link and is what you would normally want
# to use if kicad is running only on your system or one with same level of libraries.
ifndef KICAD_PYTHON
ifeq ($(STD_INSTALL), 0)
KICAD_STATIC_LINK = 1
endif
endif


ifeq ($(KICAD_STATIC_LINK), 1)
ifeq ($(KICAD_STATIC_LINK), 1)
LD  = gcc
LD  = gcc
Loading