Skip to content

Commit

Permalink
[osx] -shared means -dynamiclib and that will conflict with -bundle, …
Browse files Browse the repository at this point in the history
…use dynamic_lookup instead of suppress so loader knows to go searching
  • Loading branch information
davilla committed Jul 11, 2011
1 parent e1eefd0 commit e8999e4
Showing 1 changed file with 3 additions and 6 deletions.
9 changes: 3 additions & 6 deletions xbmc/screensavers/rsxs-0.9/xbmc/Makefile.in
Expand Up @@ -25,26 +25,23 @@ all: $(SOLARWINDS-OUT) $(PLASMA-OUT) $(EUPHORIA-OUT);

$(SOLARWINDS-OUT): $(SOLARWINDS-DEP)
ifeq ($(findstring osx,$(ARCH)), osx)
$(CXX) $(CXXFLAGS) $(LDFLAGS) -bundle -flat_namespace -undefined suppress -shared \
-mmacosx-version-min=10.4 -isysroot /Developer/SDKs/MacOSX10.4u.sdk \
$(CXX) $(CXXFLAGS) $(LDFLAGS) -bundle -flat_namespace -undefined dynamic_lookup \
-o $(SOLARWINDS-OUT) $(RSXS)/src/solarwinds/*.o $(RSXS-OBJS)
else
$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -o $(SOLARWINDS-OUT) $(RSXS)/src/solarwinds/*.o $(RSXS-OBJS) -lXmu
endif

$(PLASMA-OUT): $(PLASMA-DEP)
ifeq ($(findstring osx,$(ARCH)), osx)
$(CXX) $(CXXFLAGS) $(LDFLAGS) -bundle -flat_namespace -undefined suppress -shared \
-mmacosx-version-min=10.4 -isysroot /Developer/SDKs/MacOSX10.4u.sdk \
$(CXX) $(CXXFLAGS) $(LDFLAGS) -bundle -flat_namespace -undefined dynamic_lookup \
-o $(PLASMA-OUT) $(RSXS)/src/plasma/*.o $(RSXS-OBJS)
else
$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -o $(PLASMA-OUT) $(RSXS)/src/plasma/*.o $(RSXS-OBJS) -lXmu
endif

$(EUPHORIA-OUT): $(EUPHORIA-DEP)
ifeq ($(findstring osx,$(ARCH)), osx)
$(CXX) $(CXXFLAGS) $(LDFLAGS) -bundle -flat_namespace -undefined suppress -shared \
-mmacosx-version-min=10.4 -isysroot /Developer/SDKs/MacOSX10.4u.sdk \
$(CXX) $(CXXFLAGS) $(LDFLAGS) -bundle -flat_namespace -undefined dynamic_lookup \
-o $(EUPHORIA-OUT) $(RSXS)/src/euphoria/*.o $(RSXS)/src/pngimage.o $(RSXS-OBJS) -lpng
else
$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -o $(EUPHORIA-OUT) $(RSXS)/src/euphoria/*.o $(RSXS)/src/pngimage.o $(RSXS-OBJS) -lXmu -lpng
Expand Down

0 comments on commit e8999e4

Please sign in to comment.