aboutsummaryrefslogtreecommitdiff
path: root/desiredata/src
diff options
context:
space:
mode:
authorN.N. <matju@users.sourceforge.net>2009-05-17 02:26:59 +0000
committerN.N. <matju@users.sourceforge.net>2009-05-17 02:26:59 +0000
commit373d2888160cec068519f49b65bdde76f980bba7 (patch)
tree605abbd63d71509a607314e39c7bf4bf9abb495e /desiredata/src
parenta7515ef313970e1fa7b074b95ec5a50b59036821 (diff)
merge SRC and SRCXX
svn path=/trunk/; revision=11415
Diffstat (limited to 'desiredata/src')
-rw-r--r--desiredata/src/makefile.in7
1 files changed, 2 insertions, 5 deletions
diff --git a/desiredata/src/makefile.in b/desiredata/src/makefile.in
index 4199607f..c5b9be3d 100644
--- a/desiredata/src/makefile.in
+++ b/desiredata/src/makefile.in
@@ -35,8 +35,8 @@ EXE = @EXE@
#-----------------------------------------------------------
SRCXX = desire.c kernel.c builtins.c builtins_dsp.c s_path.c s_inter.c s_main.c \
- m_sched.c s_loader.c d_soundfile.c d_ugen.c s_audio.c s_midi.c @AUDIOSRC@ @MIDISRC@
-SRC = m_fifo.c m_simd.c d_mayer_fft.c d_fftroutine.c
+ m_sched.c s_loader.c d_soundfile.c d_ugen.c s_audio.c s_midi.c \
+ m_fifo.c m_simd.c d_mayer_fft.c d_fftroutine.c @AUDIOSRC@ @MIDISRC@
OBJ = $(SRCXX:.c=.o) $(SRC:.c=.o)
SO = libpd$(LIBSUFFIX)
@@ -51,9 +51,6 @@ bin:: pd$(EXE) $(WATCHDOG) pdsend pdreceive
$(SRCXX:.c=.o): %.o: %.c config.log
$(CXX) $(CFLAGS) -xc++ -c -o $*.o $*.c
-$(SRC:.c=.o): %.o: %.c config.log
- $(CXX) $(CFLAGS) -Wno-parentheses -Wno-switch -c -o $*.o $*.c
-
$(SO): $(OBJ) config.log
$(CXX) $(LDSOFLAGS) $(LDFLAGS) $(DBG_CFLAGS) -I../src -o $(SO) $(OBJ) $(WLIB)