summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbjarni <bjarni@openttd.org>2004-12-01 19:44:39 +0000
committerbjarni <bjarni@openttd.org>2004-12-01 19:44:39 +0000
commita317cbdc0987d506eeadce2b9452088c6bae5428 (patch)
treeb22e4e30deb91105d37725e0cf242e7ecf5a7bac
parent5a458590b86ff66bc2fd37b38ed467015db45e5f (diff)
downloadopenttd-a317cbdc0987d506eeadce2b9452088c6bae5428.tar.xz
(svn r877) Moved bemidi.cpp correctly this time
-rw-r--r--Makefile7
-rw-r--r--os/beos/bemidi.cpp (renamed from bemidi.cpp)0
2 files changed, 4 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index ec6c6cff1..fc1d781de 100644
--- a/Makefile
+++ b/Makefile
@@ -543,7 +543,8 @@ endif
ttd_OBJS = $(C_SOURCES:%.c=%.o) $(CXX_SOURCES:%.cpp=%.o)
ifdef BEOS
-CXX_SOURCES += bemidi.cpp
+CXX_SOURCES += os/beos/bemidi.cpp
+CFLAGS += -I.
endif
ifdef WIN32
@@ -745,6 +746,6 @@ DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
>> .deps/$(*F).P; \
rm .deps/$(*F).pp
-# For DirectMusic build
+# For DirectMusic build and BeOS specific parts
%.o: %.cpp $(MAKE_CONFIG)
- $(CXX_BUILD) $<
+ $(CXX_BUILD) $< -o $@
diff --git a/bemidi.cpp b/os/beos/bemidi.cpp
index d0f41d865..d0f41d865 100644
--- a/bemidi.cpp
+++ b/os/beos/bemidi.cpp