diff options
author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-12-01 10:32:14 +0100 |
---|---|---|
committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-12-01 10:32:14 +0100 |
commit | 4097e27114d227692d53c5d28487e12a3833cd24 (patch) | |
tree | d5c2a62c4db97de94f92150340612c64d3997669 /Jamtop | |
parent | f8a0a4e1c775a90c313cb83201eec4cea4e9a7da (diff) | |
parent | 5514d94483c98e3320b202b1bb882023a7d12027 (diff) |
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'Jamtop')
-rwxr-xr-x[-rw-r--r--] | Jamtop | 19 |
1 files changed, 16 insertions, 3 deletions
@@ -39,6 +39,16 @@ USE_USB = true ; # enable dummy Demo Instrument (only if code is available) USE_DEMOINST = true ; +# enable Video Test Patch Generator and 3DLUT device support +# (V2.0.0 and above) +USE_VTPGLUT = false ; + +# enable Printer device support +USE_PRINTER = false ; + +# enable CMF Measurement device support +USE_CMFM = false ; + # Use ArgyllCMS version of libusb (deprecated - don't use) USE_LIBUSB = false ; @@ -110,11 +120,14 @@ if $(UNIX) { } } if $(OS) = FREEBSD { - LINKFLAGS += -L$(LibWinD) -g -lrt -lX11 -lXext -lXxf86vm -lXinerama -lXrandr -lXau -lXdmcp -lXss -lusb ; + LINKFLAGS += -g -lrt -lusb ; + GUILINKFLAGS += -L$(LibWinD) -g -lX11 -lXext -lXxf86vm -lXinerama -lXrandr -lXau -lXdmcp -lXss ; } else if $(OS) = OPENBSD { - LINKFLAGS += -L$(LibWinD) -g -lX11 -lXext -lXxf86vm -lXinerama -lXrandr -lXau -lXdmcp -lXss -L/usr/local/lib ; + LINKFLAGS += ; + GUILINKFLAGS += -L$(LibWinD) -g -lX11 -lXext -lXxf86vm -lXinerama -lXrandr -lXau -lXdmcp -lXss -L/usr/local/lib ; } else { - LINKFLAGS += -L$(LibWinD) -ldl -lrt -lX11 -lXext -lXxf86vm -lXinerama -lXrandr -lXau -lXdmcp -lXss ; + LINKFLAGS += -ldl -lrt ; + GUILINKFLAGS += -L$(LibWinD) -lX11 -lXext -lXxf86vm -lXinerama -lXrandr -lXau -lXdmcp -lXss ; } # HDRS += $(LibWinH) ; } |