Add a custom include path for wine jackbridge, small cleanup

source/jackbridge/Makefile

@@ -15,14 +15,26 @@ WINECXX ?= wineg++
 BUILD_CXX_FLAGS += $(JACKBRIDGE_FLAGS)
 LINK_FLAGS      += $(JACKBRIDGE_LIBS)
 
-ifeq ($(MACOS),true)
 WINE_32BIT_FLAGS = $(32BIT_FLAGS)
 WINE_64BIT_FLAGS = $(64BIT_FLAGS)
 WINE_LINK_FLAGS  = $(LINK_FLAGS) $(LIBDL_LIBS) -lpthread
-else
-WINE_32BIT_FLAGS = $(32BIT_FLAGS) -L/usr/lib32/wine -L/usr/lib/i386-linux-gnu/wine -L/usr/lib/i386-linux-gnu/wine-development -L/opt/wine-staging/lib -L/opt/wine-staging/lib/wine
-WINE_64BIT_FLAGS = $(64BIT_FLAGS) -L/usr/lib64/wine -L/usr/lib/x86_64-linux-gnu/wine -L/usr/lib/x86_64-linux-gnu/wine-development -L/opt/wine-staging/lib64 -L/opt/wine-staging/lib64/wine
-WINE_LINK_FLAGS  = $(LINK_FLAGS) $(LIBDL_LIBS) -lrt -lpthread
+
+ifneq ($(MACOS),true)
+WINE_32BIT_FLAGS += -I/usr/include/wine/wine/windows
+WINE_32BIT_FLAGS += -L/usr/lib32/wine
+WINE_32BIT_FLAGS += -L/usr/lib/i386-linux-gnu/wine
+WINE_32BIT_FLAGS += -L/usr/lib/i386-linux-gnu/wine-development
+WINE_32BIT_FLAGS += -L/opt/wine-staging/lib
+WINE_32BIT_FLAGS += -L/opt/wine-staging/lib/wine
+
+WINE_64BIT_FLAGS += -I/usr/include/wine/wine/windows
+WINE_64BIT_FLAGS += -L/usr/lib64/wine
+WINE_64BIT_FLAGS += -L/usr/lib/x86_64-linux-gnu/wine
+WINE_64BIT_FLAGS += -L/usr/lib/x86_64-linux-gnu/wine-development
+WINE_64BIT_FLAGS += -L/opt/wine-staging/lib64
+WINE_64BIT_FLAGS += -L/opt/wine-staging/lib64/wine
+
+WINE_LINK_FLAGS  += -lrt
 endif
 
 # ----------------------------------------------------------------------------------------------------------------------------