Commit 1b7593f4 authored by Maciej Suminski's avatar Maciej Suminski

Fixed win32 builds.

parent 2134e7de
...@@ -5,6 +5,7 @@ include_directories( ...@@ -5,6 +5,7 @@ include_directories(
./dialog_about ./dialog_about
${Boost_INCLUDE_DIR} ${Boost_INCLUDE_DIR}
${CAIRO_INCLUDE_DIR} ${CAIRO_INCLUDE_DIR}
${GLEW_INCLUDE_DIR}
../3d-viewer ../3d-viewer
../pcbnew ../pcbnew
../polygon ../polygon
...@@ -56,9 +57,10 @@ set(GAL_SRCS ...@@ -56,9 +57,10 @@ set(GAL_SRCS
add_library(gal STATIC ${GAL_SRCS}) add_library(gal STATIC ${GAL_SRCS})
add_dependencies(gal shader_headers) add_dependencies(gal shader_headers)
if(WIN32) # Only for win32 cross compilation using MXE
if(WIN32 AND MSYS)
add_definitions(-DGLEW_STATIC) add_definitions(-DGLEW_STATIC)
endif(WIN32) endif(WIN32 AND MSYS)
set(COMMON_ABOUT_DLG_SRCS set(COMMON_ABOUT_DLG_SRCS
dialog_about/AboutDialog_main.cpp dialog_about/AboutDialog_main.cpp
......
...@@ -94,18 +94,16 @@ target_link_libraries(cvpcb ...@@ -94,18 +94,16 @@ target_link_libraries(cvpcb
common common
bitmaps bitmaps
polygon polygon
gal
${wxWidgets_LIBRARIES} ${wxWidgets_LIBRARIES}
${OPENGL_LIBRARIES} ${OPENGL_LIBRARIES}
${GDI_PLUS_LIBRARIES} ${GDI_PLUS_LIBRARIES}
${GLEW_LIBRARIES}
${CAIRO_LIBRARIES}
) )
target_link_libraries(cvpcb # Only for win32 cross compilation using MXE
gal if(WIN32 AND MSYS)
${GLEW_LIBRARIES}
${CAIRO_LIBRARIES}
)
if(WIN32)
target_link_libraries(cvpcb target_link_libraries(cvpcb
opengl32 opengl32
glu32 glu32
...@@ -114,7 +112,7 @@ target_link_libraries(cvpcb ...@@ -114,7 +112,7 @@ target_link_libraries(cvpcb
freetype freetype
bz2 bz2
) )
endif(WIN32) endif(WIN32 AND MSYS)
### ###
# Add cvpcb as install target # Add cvpcb as install target
......
...@@ -420,20 +420,18 @@ target_link_libraries(pcbnew ...@@ -420,20 +420,18 @@ target_link_libraries(pcbnew
pcad2kicadpcb pcad2kicadpcb
polygon polygon
bitmaps bitmaps
gal
${wxWidgets_LIBRARIES} ${wxWidgets_LIBRARIES}
${OPENGL_LIBRARIES} ${OPENGL_LIBRARIES}
${GDI_PLUS_LIBRARIES} ${GDI_PLUS_LIBRARIES}
${PYTHON_LIBRARIES} ${PYTHON_LIBRARIES}
${PCBNEW_EXTRA_LIBS} ${PCBNEW_EXTRA_LIBS}
)
target_link_libraries(pcbnew
gal
${GLEW_LIBRARIES} ${GLEW_LIBRARIES}
${CAIRO_LIBRARIES} ${CAIRO_LIBRARIES}
) )
if(WIN32) # Only for win32 cross compilation using MXE
if(WIN32 AND MSYS)
target_link_libraries(pcbnew target_link_libraries(pcbnew
opengl32 opengl32
glu32 glu32
...@@ -442,7 +440,7 @@ target_link_libraries(pcbnew ...@@ -442,7 +440,7 @@ target_link_libraries(pcbnew
freetype freetype
bz2 bz2
) )
endif(WIN32) endif(WIN32 AND MSYS)
### ###
# Add pcbnew as install target # Add pcbnew as install target
......
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