Commit a3ea46d0 authored by jean-pierre charras's avatar jean-pierre charras
Browse files

Fix compil issues under mingw

parent 829e952e

CMakeLists.txt

+21 −10
Original line number Diff line number Diff line
@@ -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)

pcbnew/CMakeLists.txt

+30 −25
Original line number Diff line number Diff line
@@ -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,11 @@ 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})

pcbnew/dialogs/dialog_footprint_wizard_list.cpp

+10 −10
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
 * @file dialog_scripting.cpp

 */



#include <wx-2.8/wx/generic/grid.h>

#include <wx/grid.h>