Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
K
kicad-source-mirror
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Commits
Open sidebar
Elphel
kicad-source-mirror
Commits
a201522f
Commit
a201522f
authored
Apr 09, 2012
by
Miguel Angel Ajo
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lajos kamocsay compilation patches
parent
0cdc5c59
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
13 additions
and
10 deletions
+13
-10
CMakeLists.txt
CMakeLists.txt
+4
-4
CMakeLists.txt
common/CMakeLists.txt
+1
-1
polygon.hpp
include/boost/polygon/polygon.hpp
+2
-0
CMakeLists.txt
pcbnew/CMakeLists.txt
+4
-3
dialog_scripting.cpp
pcbnew/dialogs/dialog_scripting.cpp
+1
-1
fixswigimports.py
scripting/fixswigimports.py
+1
-1
No files found.
CMakeLists.txt
View file @
a201522f
...
...
@@ -86,13 +86,13 @@ endif(KICAD_STABLE_VERSION )
if
(
CMAKE_COMPILER_IS_GNUCXX
)
# Set default flags for Release build.
set
(
CMAKE_C_FLAGS_RELEASE
"-Wall -O2 -DNDEBUG "
)
set
(
CMAKE_CXX_FLAGS_RELEASE
"-Wall -O2 -DNDEBUG"
)
set
(
CMAKE_C_FLAGS_RELEASE
"-Wall -O2 -DNDEBUG
-fPIC
"
)
set
(
CMAKE_CXX_FLAGS_RELEASE
"-Wall -O2 -DNDEBUG
-fPIC
"
)
set
(
CMAKE_EXE_LINKER_FLAGS_RELEASE
"-s"
)
# Set default flags for Debug build.
set
(
CMAKE_C_FLAGS_DEBUG
"-Wall -g3 -ggdb3 -DDEBUG"
)
set
(
CMAKE_CXX_FLAGS_DEBUG
"-Wall -g3 -ggdb3 -DDEBUG"
)
set
(
CMAKE_C_FLAGS_DEBUG
"-Wall -g3 -ggdb3 -DDEBUG
-fPIC
"
)
set
(
CMAKE_CXX_FLAGS_DEBUG
"-Wall -g3 -ggdb3 -DDEBUG
-fPIC
"
)
if
(
USE_PNG_BITMAPS
)
#Add -DUSE_PNG_BITMAPS to windres.exe command line
...
...
common/CMakeLists.txt
View file @
a201522f
...
...
@@ -150,6 +150,6 @@ if(NOT MSVC)
# This one gets made only when testing.
# to build it, first enable #define STAND_ALONE at top of dsnlexer.cpp
add_executable
(
dsntest EXCLUDE_FROM_ALL dsnlexer.cpp
)
target_link_libraries
(
dsntest common
${
wxWidgets_LIBRARIES
}
)
target_link_libraries
(
dsntest common
${
wxWidgets_LIBRARIES
}
rt
)
endif
(
NOT MSVC
)
include/boost/polygon/polygon.hpp
View file @
a201522f
...
...
@@ -24,6 +24,8 @@
#include "transform.hpp"
#include "detail/transform_detail.hpp"
#include "detail/polygon_sort_adaptor.hpp"
//interval
#include "interval_data.hpp"
#include "interval_traits.hpp"
...
...
pcbnew/CMakeLists.txt
View file @
a201522f
add_definitions
(
-DPCBNEW
)
if
(
KICAD_SCRIPTING OR KICAD_SCRIPTING_MODULES
)
EXECUTE_PROCESS
(
COMMAND python -c
"import sys;print
\"
%s.%s
\"
%sys.version_info[0:2]"
OUTPUT_VARIABLE PYTHON_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE
)
EXECUTE_PROCESS
(
COMMAND python
2
-c
"import sys;print
\"
%s.%s
\"
%sys.version_info[0:2]"
OUTPUT_VARIABLE PYTHON_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE
)
SET
(
PYTHON_DEST
"lib/python
${
PYTHON_VERSION
}
/dist-packages"
)
file
(
MAKE_DIRECTORY
${
CMAKE_CURRENT_BINARY_DIR
}
/scripting
)
...
...
@@ -392,6 +392,7 @@ target_link_libraries(pcbnew
${
OPENGL_LIBRARIES
}
${
GDI_PLUS_LIBRARIES
}
${
PYTHON_LIBRARIES
}
rt
)
###
...
...
@@ -433,12 +434,12 @@ endif(KICAD_SCRIPTING_MODULES)
if
(
NOT MSVC
)
# This one gets made only when testing.
add_executable
(
specctra_test EXCLUDE_FROM_ALL specctra_test.cpp specctra.cpp
)
target_link_libraries
(
specctra_test common
${
wxWidgets_LIBRARIES
}
)
target_link_libraries
(
specctra_test common
${
wxWidgets_LIBRARIES
}
rt
)
endif
(
NOT MSVC
)
# This one gets made only when testing.
add_executable
(
layer_widget_test WIN32 EXCLUDE_FROM_ALL
layer_widget.cpp
)
target_link_libraries
(
layer_widget_test common
${
wxWidgets_LIBRARIES
}
)
target_link_libraries
(
layer_widget_test common
${
wxWidgets_LIBRARIES
}
rt
)
pcbnew/dialogs/dialog_scripting.cpp
View file @
a201522f
...
...
@@ -3,12 +3,12 @@
*/
#include <Python.h>
#include <fctsys.h>
#include <pcbnew.h>
#include <wxPcbStruct.h>
#include <pcbcommon.h>
#include <dialog_scripting.h>
#include <Python.h>
DIALOG_SCRIPTING
::
DIALOG_SCRIPTING
(
wxWindow
*
parent
)
...
...
scripting/fixswigimports.py
View file @
a201522f
#!/usr/bin/env python
#!/usr/bin/env python
2
# the purpose of this script is rewriting the swig_import_helper
# call so it will not load _xxxxx.so/dso from inside a kicad executable
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment