aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authoricculus <icculus@edf5b092-35ff-0310-97b2-ce42778d08ea>2009-09-15 05:38:27 +0000
committericculus <icculus@edf5b092-35ff-0310-97b2-ce42778d08ea>2009-09-15 05:38:27 +0000
commitda827dbb091b0cba604e408854fa7d89f83c5b65 (patch)
tree08c719ed9ba9005f4efce4def068de4a431f6d11 /Makefile
parent4d2bb35e55e29ef01e7a8f86a4f817e6ec0735aa (diff)
downloadioquake3-aero-da827dbb091b0cba604e408854fa7d89f83c5b65.tar.gz
ioquake3-aero-da827dbb091b0cba604e408854fa7d89f83c5b65.zip
Added a real GUI message box to Sys_ErrorDialog() on Mac OS X.
Fixes Bugzilla #3654. git-svn-id: svn://svn.icculus.org/quake3/trunk@1616 edf5b092-35ff-0310-97b2-ce42778d08ea
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile17
1 files changed, 17 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index d190f6d..b2ad6cb 100644
--- a/Makefile
+++ b/Makefile
@@ -1502,6 +1502,11 @@ else
$(B)/client/sys_unix.o
endif
+ifeq ($(PLATFORM),darwin)
+ Q3OBJ += \
+ $(B)/client/sys_cocoa.o
+endif
+
ifeq ($(USE_MUMBLE),1)
Q3OBJ += \
$(B)/client/libmumblelink.o
@@ -1653,6 +1658,12 @@ else
$(B)/ded/con_tty.o
endif
+# Not currently referenced in the dedicated server.
+#ifeq ($(PLATFORM),darwin)
+# Q3DOBJ += \
+# $(B)/ded/sys_cocoa.o
+#endif
+
$(B)/ioq3ded$(FULLBINEXT): $(Q3DOBJ)
$(echo_cmd) "LD $@"
$(Q)$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(Q3DOBJ) $(LIBS)
@@ -1979,6 +1990,9 @@ $(B)/clientsmp/%.o: $(SDLDIR)/%.c
$(B)/client/%.o: $(SYSDIR)/%.c
$(DO_CC)
+$(B)/client/%.o: $(SYSDIR)/%.m
+ $(DO_CC)
+
$(B)/client/%.o: $(SYSDIR)/%.rc
$(DO_WINDRES)
@@ -1998,6 +2012,9 @@ $(B)/ded/%.o: $(BLIBDIR)/%.c
$(B)/ded/%.o: $(SYSDIR)/%.c
$(DO_DED_CC)
+$(B)/ded/%.o: $(SYSDIR)/%.m
+ $(DO_DED_CC)
+
$(B)/ded/%.o: $(SYSDIR)/%.rc
$(DO_WINDRES)