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

Fixed win32 builds.

This commit is contained in:
Maciej Suminski 2013-08-10 11:14:16 +02:00
parent 2134e7de04
commit 1b7593f403
3 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
common/CMakeLists.txt
View File

@ -5,6 +5,7 @@ include_directories(
./dialog_about
${Boost_INCLUDE_DIR}
${CAIRO_INCLUDE_DIR}
${GLEW_INCLUDE_DIR}
../3d-viewer
../pcbnew
../polygon
@ -56,9 +57,10 @@ set(GAL_SRCS
add_library(gal STATIC ${GAL_SRCS})
add_dependencies(gal shader_headers)
if(WIN32)
# Only for win32 cross compilation using MXE
if(WIN32 AND MSYS)
add_definitions(-DGLEW_STATIC)
endif(WIN32)
endif(WIN32 AND MSYS)
set(COMMON_ABOUT_DLG_SRCS
dialog_about/AboutDialog_main.cpp

14
cvpcb/CMakeLists.txt
View File

@ -94,18 +94,16 @@ target_link_libraries(cvpcb
common
bitmaps
polygon
gal
${wxWidgets_LIBRARIES}
${OPENGL_LIBRARIES}
${GDI_PLUS_LIBRARIES}
${GLEW_LIBRARIES}
${CAIRO_LIBRARIES}
)
target_link_libraries(cvpcb
gal
${GLEW_LIBRARIES}
${CAIRO_LIBRARIES}
)
if(WIN32)
# Only for win32 cross compilation using MXE
if(WIN32 AND MSYS)
target_link_libraries(cvpcb
opengl32
glu32
@ -114,7 +112,7 @@ target_link_libraries(cvpcb
freetype
bz2
)
endif(WIN32)
endif(WIN32 AND MSYS)
###
# Add cvpcb as install target

12
pcbnew/CMakeLists.txt
View File

@ -420,20 +420,18 @@ target_link_libraries(pcbnew
pcad2kicadpcb
polygon
bitmaps
gal
${wxWidgets_LIBRARIES}
${OPENGL_LIBRARIES}
${GDI_PLUS_LIBRARIES}
${PYTHON_LIBRARIES}
${PCBNEW_EXTRA_LIBS}
)
target_link_libraries(pcbnew
gal
${GLEW_LIBRARIES}
${CAIRO_LIBRARIES}
)
if(WIN32)
# Only for win32 cross compilation using MXE
if(WIN32 AND MSYS)
target_link_libraries(pcbnew
opengl32
glu32
@ -442,7 +440,7 @@ target_link_libraries(pcbnew
freetype
bz2
)
endif(WIN32)
endif(WIN32 AND MSYS)
###
# Add pcbnew as install target