equal
deleted
inserted
replaced
716 C_SOURCES += video/dedicated_v.c |
716 C_SOURCES += video/dedicated_v.c |
717 C_SOURCES += video/null_v.c |
717 C_SOURCES += video/null_v.c |
718 |
718 |
719 CXX_SOURCES = |
719 CXX_SOURCES = |
720 |
720 |
|
721 OBJC_SOURCES = |
|
722 |
721 ifdef WITH_SDL |
723 ifdef WITH_SDL |
722 C_SOURCES += sdl.c |
724 C_SOURCES += sdl.c |
723 C_SOURCES += sound/sdl_s.c |
725 C_SOURCES += sound/sdl_s.c |
724 C_SOURCES += video/sdl_v.c |
726 C_SOURCES += video/sdl_v.c |
725 endif |
727 endif |
732 else |
734 else |
733 C_SOURCES += unix.c |
735 C_SOURCES += unix.c |
734 C_SOURCES += music/extmidi.c |
736 C_SOURCES += music/extmidi.c |
735 endif |
737 endif |
736 |
738 |
737 OBJS = $(C_SOURCES:%.c=%.o) $(CXX_SOURCES:%.cpp=%.o) |
739 ifdef OSX |
|
740 OBJC_SOURCES += os/macosx/macos.m |
|
741 endif |
|
742 |
|
743 OBJS = $(C_SOURCES:%.c=%.o) $(CXX_SOURCES:%.cpp=%.o) $(OBJC_SOURCES:%.m=%.o) |
738 |
744 |
739 ifdef BEOS |
745 ifdef BEOS |
740 CXX_SOURCES += music/bemidi.cpp |
746 CXX_SOURCES += music/bemidi.cpp |
741 endif |
747 endif |
742 |
748 |
792 quiet_cmd_c_compile = '===> Compiling $<' |
798 quiet_cmd_c_compile = '===> Compiling $<' |
793 cmd_c_compile = $(CC) $(COMPILE_PARAMS) |
799 cmd_c_compile = $(CC) $(COMPILE_PARAMS) |
794 |
800 |
795 quiet_cmd_cxx_compile = '===> Compiling $<' |
801 quiet_cmd_cxx_compile = '===> Compiling $<' |
796 cmd_cxx_compile = $(CXX) $(COMPILE_PARAMS) |
802 cmd_cxx_compile = $(CXX) $(COMPILE_PARAMS) |
|
803 |
|
804 quiet_cmd_objc_compile = '===> Compiling $<' |
|
805 cmd_objc_compile = $(CC) $(COMPILE_PARAMS) |
797 |
806 |
798 |
807 |
799 ############################################################################## |
808 ############################################################################## |
800 # |
809 # |
801 # Targets |
810 # Targets |
1034 |
1043 |
1035 |
1044 |
1036 ### Internal build rules |
1045 ### Internal build rules |
1037 |
1046 |
1038 # This makes sure the .deps dir is always around. |
1047 # This makes sure the .deps dir is always around. |
1039 DEPS_MAGIC := $(shell mkdir -p .deps .deps/music .deps/sound .deps/video) |
1048 DEPS_MAGIC := $(shell mkdir -p .deps .deps/music .deps/sound .deps/video .deps/os .deps/os/macosx) |
1040 |
1049 |
1041 # Introduce the dependencies |
1050 # Introduce the dependencies |
1042 -include $(DEPS) |
1051 -include $(DEPS) |
1043 |
1052 |
1044 # This compiles the object file as well as silently updating its dependencies |
1053 # This compiles the object file as well as silently updating its dependencies |
1052 |
1061 |
1053 %.o: %.cpp $(MAKE_CONFIG) endian_target.h table/strings.h |
1062 %.o: %.cpp $(MAKE_CONFIG) endian_target.h table/strings.h |
1054 $(call cmd,cxx_compile) |
1063 $(call cmd,cxx_compile) |
1055 @mv $(<:%.cpp=%.d) $(<:%.cpp=.deps/%.d) |
1064 @mv $(<:%.cpp=%.d) $(<:%.cpp=.deps/%.d) |
1056 |
1065 |
|
1066 %.o: %.m $(MAKE_CONFIG) endian_target.h table/strings.h |
|
1067 $(call cmd,objc_compile) |
|
1068 @mv $(<:%.m=%.d) $(<:%.m=.deps/%.d) |
|
1069 |
1057 # Silence stale header dependencies |
1070 # Silence stale header dependencies |
1058 %.h: |
1071 %.h: |
1059 @true |
1072 @true |
1060 |
1073 |
1061 |
1074 |