haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes Win32 compilation that my previous commit broke, thanks to JP

This commit is contained in:
Miguel Angel Ajo 2012-07-16 16:48:51 +02:00
parent 829e952e49
commit 465dabd919
4 changed files with 48 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
CMakeLists.txt
View File

@ -91,6 +91,16 @@ endif(KICAD_STABLE_VERSION )
#================================================
if(CMAKE_COMPILER_IS_GNUCXX)
if(WIN32) # under Windows/mingw, -fPIC option is enabled by default
# Set default flags for Release build.
set(CMAKE_C_FLAGS_RELEASE "-Wall -O2 -DNDEBUG")
set(CMAKE_CXX_FLAGS_RELEASE "-Wall -O2 -DNDEBUG")
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")
else(WIN32)
# Set default flags for Release build.
set(CMAKE_C_FLAGS_RELEASE "-Wall -O2 -DNDEBUG -fPIC")
set(CMAKE_CXX_FLAGS_RELEASE "-Wall -O2 -DNDEBUG -fPIC")
@ -99,6 +109,7 @@ if(CMAKE_COMPILER_IS_GNUCXX)
# Set default flags for Debug build.
set(CMAKE_C_FLAGS_DEBUG "-Wall -g3 -ggdb3 -DDEBUG -fPIC")
set(CMAKE_CXX_FLAGS_DEBUG "-Wall -g3 -ggdb3 -DDEBUG -fPIC")
endif(WIN32)
endif(CMAKE_COMPILER_IS_GNUCXX)

12
pcbnew/CMakeLists.txt
View File

@ -337,6 +337,11 @@ if (KICAD_SCRIPTING_MODULES)
endif (KICAD_SCRIPTING_MODULES)
if (KICAD_SCRIPTING OR KICAD_SCRIPTING_MODULES)
set ( PCBNEW_EXTRA_LIBS "rt" )
endif (KICAD_SCRIPTING OR KICAD_SCRIPTING_MODULES)
###
# Windows resource file
###
@ -410,6 +415,7 @@ endif(APPLE)
###
# Link executable target pcbnew with correct libraries
###
target_link_libraries(pcbnew
3d-viewer
pcbcommon
@ -421,7 +427,7 @@ target_link_libraries(pcbnew
${OPENGL_LIBRARIES}
${GDI_PLUS_LIBRARIES}
${PYTHON_LIBRARIES}
rt
${PCBNEW_EXTRA_LIBS}
)
###
@ -463,12 +469,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} rt)
target_link_libraries(specctra_test common ${wxWidgets_LIBRARIES})
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} rt)
target_link_libraries(layer_widget_test common ${wxWidgets_LIBRARIES})

4
pcbnew/dialogs/dialog_footprint_wizard_list.cpp
View File

@ -1,8 +1,8 @@
/**
* @file dialog_scripting.cpp
* @file dialog_footprint_wizard_list.cpp
*/
#include <wx-2.8/wx/generic/grid.h>
#include <wx/grid.h>

3
pcbnew/footprint_wizard.cpp
View File

@ -87,6 +87,9 @@ void FOOTPRINT_WIZARD_FRAME::DisplayWizardInfos()
void FOOTPRINT_WIZARD_FRAME::ReloadFootprint()
{
if( m_FootprintWizard == NULL )
return;
SetCurItem( NULL );
// Delete the current footprint
GetBoard()->m_Modules.DeleteAll();