diff --git a/build/Makefile b/build/Makefile index 45d15d8..2ac6c9b 100644 --- a/build/Makefile +++ b/build/Makefile @@ -77,26 +77,20 @@ #Include directories and macros INCDIRS = $(PROJECT_PATH) $(PROJECT_PATH)/gui $(POWERMON_LIB_PATH)/inc -INCDIRS += $(PROJECT_PATH)/lib/wxWidgets/lib/$(UBUNTU_RELEASE) $(PROJECT_PATH)/lib/wxWidgets/include CPPDEFS += _FILE_OFFSET_BITS=64 __WXGTK__ wxDEBUG_LEVEL=0 CFLAGS += -CXXFLAGS += -Wno-unused-parameter +CXXFLAGS += -Wno-unused-parameter `wx-config --cxxflags` -LDFLAGS += -lstdc++ -lbluetooth -lm -ldl -LDFLAGS += -lrt -lpthread -lgtk-3 -lgdk-3 -lz -lpangocairo-1.0 -lpango-1.0 -lharfbuzz -latk-1.0 -lcairo-gobject -lcairo -lgdk_pixbuf-2.0 -lgio-2.0 -lgobject-2.0 -lgthread-2.0 -lglib-2.0 -lX11 -lXxf86vm -lSM -lxkbcommon -lXtst -lpangoft2-1.0 -lfontconfig -lfreetype -lpng -lz -ljpeg -ltiff -ljbig -lexpat -lpcre2-32 -lcurl - - +LDFLAGS += -lstdc++ -lbluetooth -lm -ldl `wx-config --libs` LIBS += $(POWERMON_LIB_PATH)/powermon_lib.a -LIBS += $(PROJECT_PATH)/lib/wxWidgets/lib/$(UBUNTU_RELEASE)/libwx_gtk3u-3.2.a include $(PROJECT_PATH)/submodules/build_scripts/config_linux.mk - SHORTCUT = $(OUTDIR)/$(TARGET).desktop