aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Horn2004-02-25 10:09:18 +0000
committerMax Horn2004-02-25 10:09:18 +0000
commita9507e63a85602d0e3a1e79fdacb189a52458397 (patch)
treece2613e4b76c9587c6c45d77fe5ae30287df00af
parentac42e1a4368f3cab18a6c73219004b3cbd765c63 (diff)
downloadscummvm-rg350-a9507e63a85602d0e3a1e79fdacb189a52458397.tar.gz
scummvm-rg350-a9507e63a85602d0e3a1e79fdacb189a52458397.tar.bz2
scummvm-rg350-a9507e63a85602d0e3a1e79fdacb189a52458397.zip
alternate linking order, avoids 'SDL_main' related linker errors on OSX (this shouldn't break other linkers, I hope - if it does, please tell me, and feel free to undo this)
svn-id: r13049
-rw-r--r--Makefile.common2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile.common b/Makefile.common
index 7212d3ec79..55186f3d66 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -109,7 +109,7 @@ base/main.o: $(filter-out base/libbase.a,$(OBJS))
# The build rule for the ScummVM executable
$(EXECUTABLE): $(OBJS)
- $(CXX) $(LDFLAGS) $(PRE_OBJS_FLAGS) $+ $(POST_OBJS_FLAGS) $(LIBS) -o $@
+ $(CXX) $(LDFLAGS) $(LIBS) $(PRE_OBJS_FLAGS) $+ $(POST_OBJS_FLAGS) -o $@
distclean: clean
$(RM_REC) $(DEPDIRS)