Commit 23172cce authored by Dick Hollenbeck's avatar Dick Hollenbeck

compile base_screen.cpp separately for {pcbnew,cvpcb} and eeschema, so we can...

compile base_screen.cpp separately for {pcbnew,cvpcb} and eeschema, so we can diverge internal units at compile time, not runtime
parent 2b394c7c
......@@ -26,7 +26,6 @@ set(COMMON_ABOUT_DLG_SRCS
set(COMMON_SRCS
${COMMON_ABOUT_DLG_SRCS}
base_screen.cpp
base_struct.cpp
basicframe.cpp
bezier_curves.cpp
......@@ -81,6 +80,7 @@ set(COMMON_SRCS
add_library(common ${COMMON_SRCS})
set(PCB_COMMON_SRCS
base_screen.cpp
pcbcommon.cpp
footprint_info.cpp
class_layer_box_selector.cpp
......
......@@ -77,7 +77,8 @@ endif(APPLE)
add_executable(cvpcb WIN32 MACOSX_BUNDLE
${CVPCB_SRCS}
${CVPCB_DIALOGS}
${CVPCB_RESOURCES})
${CVPCB_RESOURCES}
)
###
# Set properties for APPLE on cvpcb target
......@@ -89,11 +90,18 @@ endif(APPLE)
###
# Link executable target cvpcb with correct libraries
###
target_link_libraries(cvpcb 3d-viewer pcbcommon common polygon bitmaps kbool
target_link_libraries(cvpcb
3d-viewer
pcbcommon
common
polygon
bitmaps
kbool
${OPENGL_LIBRARIES}
${wxWidgets_LIBRARIES}
${GDI_PLUS_LIBRARIES}
)
###
# Add cvpcb as install target
###
......
......@@ -158,6 +158,7 @@ set(EESCHEMA_SRCS
set(EESCHEMA_COMMON_SRCS
../common/dialogs/dialog_page_settings.cpp
../common/base_screen.cpp
)
......
......@@ -66,7 +66,8 @@ if(APPLE)
${CMAKE_CURRENT_SOURCE_DIR}/Info.plist)
endif(APPLE)
target_link_libraries( pcb_calculator common polygon bitmaps
target_link_libraries( pcb_calculator
common polygon bitmaps
${wxWidgets_LIBRARIES}
)
......
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