summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorbjarni <bjarni@openttd.org>2004-12-01 19:42:42 +0000
committerbjarni <bjarni@openttd.org>2004-12-01 19:42:42 +0000
commit5a458590b86ff66bc2fd37b38ed467015db45e5f (patch)
treeb7d9ed20373daa9ddb206574ede40e7130460c10 /Makefile
parente9b49ebf8e648fb553d437548b91c65f015fa075 (diff)
downloadopenttd-5a458590b86ff66bc2fd37b38ed467015db45e5f.tar.xz
(svn r876) reverted the accidently cleared bemidi.cpp
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile7
1 files changed, 3 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index fc1d781de..ec6c6cff1 100644
--- a/Makefile
+++ b/Makefile
@@ -543,8 +543,7 @@ endif
ttd_OBJS = $(C_SOURCES:%.c=%.o) $(CXX_SOURCES:%.cpp=%.o)
ifdef BEOS
-CXX_SOURCES += os/beos/bemidi.cpp
-CFLAGS += -I.
+CXX_SOURCES += bemidi.cpp
endif
ifdef WIN32
@@ -746,6 +745,6 @@ DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
>> .deps/$(*F).P; \
rm .deps/$(*F).pp
-# For DirectMusic build and BeOS specific parts
+# For DirectMusic build
%.o: %.cpp $(MAKE_CONFIG)
- $(CXX_BUILD) $< -o $@
+ $(CXX_BUILD) $<