diff --git a/build/Makefile b/build/Makefile index 9dc2c20..45d15d8 100644 --- a/build/Makefile +++ b/build/Makefile @@ -77,8 +77,7 @@ #Include directories and macros INCDIRS = $(PROJECT_PATH) $(PROJECT_PATH)/gui $(POWERMON_LIB_PATH)/inc -INCDIRS += $(PROJECT_PATH)/submodules/wxWidgets/bin_$(UBUNTU_RELEASE)/lib/wx/include/gtk3-unicode-static-3.2 -INCDIRS += $(PROJECT_PATH)/submodules/wxWidgets/include +INCDIRS += $(PROJECT_PATH)/lib/wxWidgets/lib/$(UBUNTU_RELEASE) $(PROJECT_PATH)/lib/wxWidgets/include CPPDEFS += _FILE_OFFSET_BITS=64 __WXGTK__ wxDEBUG_LEVEL=0 @@ -91,7 +90,7 @@ LIBS += $(POWERMON_LIB_PATH)/powermon_lib.a -LIBS += $(PROJECT_PATH)/submodules/wxWidgets/bin_$(UBUNTU_RELEASE)/lib/libwx_gtk3u-3.2.a +LIBS += $(PROJECT_PATH)/lib/wxWidgets/lib/$(UBUNTU_RELEASE)/libwx_gtk3u-3.2.a include $(PROJECT_PATH)/submodules/build_scripts/config_linux.mk @@ -161,16 +160,5 @@ scp -r repo/* pegasus:~/Pending/apt.thornwave.com -wxwidgets: - -@$(RM) -rf $(PROJECT_PATH)/submodules/wxWidgets/bin_$(UBUNTU_RELEASE) - @$(MKDIR) $(PROJECT_PATH)/submodules/wxWidgets/bin_$(UBUNTU_RELEASE) - @$(CD) $(PROJECT_PATH)/submodules/wxWidgets/bin_$(UBUNTU_RELEASE); ../configure --disable-shared --with-opengl --with-gtk=3 --enable-monolithic --disable-debug - +$(MAKE) -C $(PROJECT_PATH)/submodules/wxWidgets/bin_$(UBUNTU_RELEASE) - - -wxwidgets_clean: - -@$(RM) -rf $(PROJECT_PATH)/submodules/wxWidgets/bin_$(UBUNTU_RELEASE) - - user_clean_target: -@$(RM) -rf repo