Commit 7f9e2960 authored by raburton's avatar raburton

remove all those 2 line wx configure scripts, instead they are now listed in...

remove all those 2 line wx configure scripts, instead they are now listed in the how-to-build-kicad file
parent 30b3c00f
...@@ -9,15 +9,12 @@ unzip sources in a working directory. ...@@ -9,15 +9,12 @@ unzip sources in a working directory.
This will create the directory "kicad-dev". This will create the directory "kicad-dev".
First you must install wxWidgets (see www.wxWidgets.org) First you must install wxWidgets (see www.wxWidgets.org)
See mybuild_wxWidgets_linux.txt and mybuild_wxWidgets_windows.txt See below for suggested configure command.
(in kicad-dev ) which are scripts running configure for both systems.
Linux compilation: Linux compilation:
You must have: You must have:
wxWidgets ( I suggest you install wxWidgets in /usr/local). wxWidgets ( I suggest you install wxWidgets in /usr/local).
(you can copy mybuild_wxWidgets_linux.txt in wxWidgets directory an run (see below for suggested configure command, then make and make install)
sh mybuild_wxWidgets_linux.txt
and make and make install)
Mesa: pcbnew and cvpcv need openGL or mesa. Mesa: pcbnew and cvpcv need openGL or mesa.
(you must install mesa devel if libGL et libGLU are not found). (you must install mesa devel if libGL et libGLU are not found).
...@@ -35,13 +32,13 @@ make install ( libGL.a et libGLU.a are copied in /usr/local/lib, and header in / ...@@ -35,13 +32,13 @@ 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 edit this file if you have problems)
Currently libs.linux uses wxWidgets 2.7.1 build with script "mybuild_wxWidgets_linux.txt" Currently libs.linux uses wxWidgets 2.7.1 build (see below for suggested configure command)
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 build with script "mybuild_wxWidgets_windows.txt" Currently libs.linux uses wxWidgets 2.8.1 (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)
...@@ -51,8 +48,7 @@ Under msys: ...@@ -51,8 +48,7 @@ Under msys:
of msys.) of msys.)
Build wxWidgets (currently version 2.8.1) Build wxWidgets (currently version 2.8.1)
you can copy mybuild_wxWidgets_windows.txt in wxWidgets directory an run See below for suggested configure command, then make
./mybuild_wxWidgets_windows.txt and 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
...@@ -71,6 +67,33 @@ Under msys: ...@@ -71,6 +67,33 @@ Under msys:
in kicad-dev: in kicad-dev:
run make -f makefile.g95 run make -f makefile.g95
*************************************************************************************
Building wxWidgets:
*************************************************************************************
linux:
rm *.cache
./configure --enable-monolithic --enable-unicode=no --enable-shared=no --with-opengl --with-libpng=builtin --with-libjpeg=builtin --with-libtiff=builtin --with-zlib=builtin --with-regex=builtin
linux-unicode:
rm *.cache
./configure --enable-monolithic --enable-unicode=yes --enable-shared=no --with-opengl --with-libpng=builtin --with-libjpeg=builtin --with-libtiff=builtin --with-zlib=builtin --with-regex=builtin
osX:
rm *.cache
./configure --enable-unicode=yes --enable-shared=no --enable-monolithic --with-opengl --disable-universal --disable-compat24
osX-unicode:
rm *.cache
./configure --enable-unicode=yes --enable-shared=no --enable-monolithic --with-opengl --enable-universal_binary
windows:
rm *.cache
./configure --enable-unicode=no --enable-shared=no --enable-monolithic --with-msw --with-opengl --with-odbc
windows-unicode:
rm *.cache
./configure --enable-unicode=yes --enable-shared=no --enable-monolithic --with-msw --with-opengl
************************************************************************************* *************************************************************************************
Patch wxWidgets Patch wxWidgets
************************************************************************************* *************************************************************************************
......
rm *.cache
./configure --enable-monolithic --enable-unicode=no --enable-shared=no --with-opengl --with-libpng=builtin --with-libjpeg=builtin --with-libtiff=builtin --with-zlib=builtin --with-regex=builtin
rm *.cache
./configure --enable-monolithic --enable-unicode=yes --enable-shared=no --with-opengl --with-libpng=builtin --with-libjpeg=builtin --with-libtiff=builtin --with-zlib=builtin --with-regex=builtin
rm *.cache
./configure --enable-unicode=yes --enable-shared=no --enable-monolithic --with-opengl --disable-universal --disable-compat24
rm *.cache
./configure --enable-unicode=yes --enable-shared=no --enable-monolithic --with-opengl --enable-universal_binary
rm *.cache
./configure --enable-unicode=no --enable-shared=no --enable-monolithic --with-msw --with-opengl --with-odbc
rm *.cache
./configure --enable-unicode=yes --enable-shared=no --enable-monolithic --with-msw --with-opengl
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