mirror of
https://github.com/polybar/polybar.git
synced 2025-04-21 17:42:23 -04:00
fix(gcc): Build all components directly into polybar executable
gcc-5 seemed to be having issues trying to link with the components separated out into a separate static library, so for now it's easier to just fall back on building all components together with main.cpp.
This commit is contained in:
parent
455e8c5596
commit
95588a2c21
2 changed files with 12 additions and 22 deletions
|
@ -6,7 +6,6 @@
|
|||
# Source tree {{{
|
||||
|
||||
add_subdirectory(cairo)
|
||||
add_subdirectory(components)
|
||||
add_subdirectory(drawtypes)
|
||||
add_subdirectory(events)
|
||||
add_subdirectory(modules)
|
||||
|
@ -20,11 +19,22 @@ add_subdirectory(x11)
|
|||
make_executable(polybar
|
||||
SOURCES
|
||||
main.cpp
|
||||
components/bar.cpp
|
||||
components/builder.cpp
|
||||
components/command_line.cpp
|
||||
components/config.cpp
|
||||
components/controller.cpp
|
||||
components/ipc.cpp
|
||||
components/logger.cpp
|
||||
components/parser.cpp
|
||||
components/renderer.cpp
|
||||
components/screen.cpp
|
||||
components/taskqueue.cpp
|
||||
INCLUDE_DIRS
|
||||
${dirs}
|
||||
TARGET_DEPENDS
|
||||
polybar-modules-internal_shared
|
||||
polybar-components_static
|
||||
polybar-cairo_static
|
||||
polybar-drawtypes_static
|
||||
polybar-events_static
|
||||
polybar-utils_static
|
||||
|
|
|
@ -1,20 +0,0 @@
|
|||
make_library(polybar-components
|
||||
STATIC
|
||||
INTERNAL
|
||||
SOURCES
|
||||
bar.cpp
|
||||
builder.cpp
|
||||
command_line.cpp
|
||||
config.cpp
|
||||
controller.cpp
|
||||
ipc.cpp
|
||||
logger.cpp
|
||||
parser.cpp
|
||||
renderer.cpp
|
||||
screen.cpp
|
||||
taskqueue.cpp
|
||||
INCLUDE_DIRS
|
||||
${dirs}
|
||||
RAW_DEPENDS
|
||||
${libs}
|
||||
polybar-cairo_static)
|
Loading…
Add table
Reference in a new issue