hook up flatgui to ship the knob binary

externals/Makefile

@@ -134,11 +134,9 @@ ifeq ($(LIGHT),yes)
 lib_targets = loaders-libdir pddp
 INCREMENTAL = yes
 else
-lib_targets = adaptive arraysize autotune bassemu boids bsaylor comport creb cxc cyclone disis earplug ekext ext13 fftease fluid freeverb ggee hcs iem_ambi iem_bin_ambi iemlib iemgui iemguts iem_adaptfilt iemmatrix iemxmlrpc iem_delay iem_roomsim iem_spec2 iem_tab jasch_lib loaders-libdir lyonpotpourri mapping markex maxlib mjlib moocow moonlib motex mrpeach oscx pan pdcontainer pddp pdlua pdogg plugin pmpd rjlib sigpack smlib tof unauthorized vbap windowing zexy
+lib_targets = adaptive arraysize autotune bassemu boids bsaylor comport creb cxc cyclone disis earplug ekext ext13 fftease flatgui fluid freeverb ggee hcs iem_ambi iem_bin_ambi iemlib iemgui iemguts iem_adaptfilt iemmatrix iemxmlrpc iem_delay iem_roomsim iem_spec2 iem_tab jasch_lib loaders-libdir lyonpotpourri mapping markex maxlib mjlib moocow moonlib motex mrpeach oscx pan pdcontainer pddp pdlua pdogg plugin pmpd rjlib sigpack smlib tof unauthorized vbap windowing zexy
 endif
 
-# DISABLED: flatgui
-
 # NEW (IN-PROGRESS): flext
 
 # this is for libraries that don't compile (yet) on all platforms
@@ -538,16 +536,21 @@ fftease_clean:
 
 #------------------------------------------------------------------------------#
 # FLATGUI
+#
+# Right now we're just building footils/knob and throwing it in the flatgui
+# external directory for compatibility
+#
 flatgui:
-	make -C $(externals_src)/flatgui CFLAGS="$(CFLAGS)" \
-		PD_PATH=$(pd_src) PD_INCLUDE=$(pd_src)/src
+	make -C $(externals_src)/footils/knob CFLAGS="$(CFLAGS)" \
+		PD_PATH=$(pd_src) pdbinpath=$(pd_src/src) \
+		PD_INCLUDE=$(pd_src)/src
 
 flatgui_install:
-	make -C $(externals_src)/flatgui STRIP="$(STRIP)" \
+	make -C $(externals_src)/footils/knob STRIP="$(STRIP)" \
 		DESTDIR="$(DESTDIR)" objectsdir="$(objectsdir)" install
 
 flatgui_clean:
-	make -C $(externals_src)/flatgui clean
+	make -C $(externals_src)/footils/knob clean
 
 #------------------------------------------------------------------------------#
 # FLEXT and FLEXT externals

externals/footils/knob/makefile

-NAME=knob
-CSYM=knob
-
-# !!!
-# change these two
-PD_DIR=../../../pd
-#current: pd_nt pd_linux
-current: pd_linux
-
-# ----------------------- NT -----------------------
-
-pd_nt: $(NAME).dll
-
-.SUFFIXES: .dll
-
-PDNTCFLAGS = /W3 /WX /O2 /G6 /DNT /DPD /nologo
-
-# where is VC++ ???
-VC="C:\Programme\Microsoft Visual Studio\VC98"
-
-# where is your m_pd.h ???
-PDNTINCLUDE = /I. /Ic:\pd\tcl\include /Ic:\pd\src /I$(VC)\include /Iinclude
-
-PDNTLDIR = $(VC)\Lib
-PDNTLIB = $(PDNTLDIR)\libc.lib \
-	$(PDNTLDIR)\oldnames.lib \
-	$(PDNTLDIR)\kernel32.lib \
-	$(PDNTLDIR)\user32.lib \
-	$(PDNTLDIR)\uuid.lib \
-	$(PDNTLDIR)\ws2_32.lib \
-	c:\pd\bin\pd.lib
-
-.c.dll:
-	cl $(PDNTCFLAGS) $(PDNTINCLUDE) /c $*.c
-	link /dll /export:$(CSYM)_setup $*.obj $(PDNTLIB)
-
-# ----------------------- IRIX 5.x -----------------------
-
-pd_irix5: $(NAME).pd_irix5
-
-.SUFFIXES: .pd_irix5
-
-SGICFLAGS5 = -o32 -DPD -DUNIX -DIRIX -O2
-
-SGIINCLUDE =  -I../../src
-
-.c.pd_irix5:
-	cc $(SGICFLAGS5) $(SGIINCLUDE) -o $*.o -c $*.c
-	ld -elf -shared -rdata_shared -o $*.pd_irix5 $*.o
-	rm $*.o
-
-# ----------------------- IRIX 6.x -----------------------
-
-pd_irix6: $(NAME).pd_irix6
-
-.SUFFIXES: .pd_irix6
-
-SGICFLAGS6 = -n32 -DPD -DUNIX -DIRIX -DN32 -woff 1080,1064,1185 \
-	-OPT:roundoff=3 -OPT:IEEE_arithmetic=3 -OPT:cray_ivdep=true \
-	-Ofast=ip32
-
-.c.pd_irix6:
-	cc $(SGICFLAGS6) $(SGIINCLUDE) -o $*.o -c $*.c
-	ld -n32 -IPA -shared -rdata_shared -o $*.pd_irix6 $*.o
-	rm $*.o
-
-# ----------------------- LINUX i386 -----------------------
-
-pd_linux: $(NAME).pd_linux
-
-.SUFFIXES: .pd_linux
-
-LINUXCFLAGS = -DPD -DUNIX -O2 -funroll-loops -fomit-frame-pointer \
-    -Wall -W -Wshadow -Wstrict-prototypes -Werror \
-    -Wno-unused -Wno-parentheses -Wno-switch
-
-# where is your m_pd.h ???
-LINUXINCLUDE =  -I../../src -I$(PD_DIR)/src
-
-.c.pd_linux:
-	cc -O2 -Wall -DPD -fPIC $(LINUXINCLUDE) -c $*.c 
-	ld --export-dynamic  -shared -o $*.pd_linux $*.o -lc 
-	strip $*.pd_linux 
-
-# ----------------------------------------------------------
-
-install:
-	cp help-*.pd ../../doc/5.reference
-
-clean:
-	rm -f *.o *.pd_* so_locations
+# Makefile for mylib
+
+lib.name = flatgui
+
+class.sources = knob.c
+
+# ldlibs = -lfluidsynth
+
+datafiles = knob-help.pd clock.pd README
+
+externalsdir = ../../
+
+include Makefile.pdlibbuilder.revised