wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 386445 - mac build stops with "multiple definitions of symbol nsINIParser::GetSrings", also changes to building mac dylibs with -single_module, r=luser,jag

Browse Source
This commit is contained in:
benjamin@smedbergs.us 2007-07-11 10:26:11 -07:00
parent fc044d96d8
commit 27c6275bc8
8 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
config/rules.mk
View File

@ -429,7 +429,7 @@ ifdef SHARED_LIBRARY
ifdef IS_COMPONENT
EXTRA_DSO_LDOPTS += -bundle
else
EXTRA_DSO_LDOPTS += -dynamiclib -install_name @executable_path/$(SHARED_LIBRARY) -compatibility_version 1 -current_version 1
EXTRA_DSO_LDOPTS += -dynamiclib -install_name @executable_path/$(SHARED_LIBRARY) -compatibility_version 1 -current_version 1 -single_module
endif
endif
endif
@ -1288,12 +1288,18 @@ $(OBJ_PREFIX)%.$(OBJ_SUFFIX): %.m Makefile Makefile.in
%.s: %.cpp
$(CCC) -S $(COMPILE_CXXFLAGS) $(_VPATH_SRCS)
%.s: %.cc
$(CCC) -S $(COMPILE_CXXFLAGS) $(_VPATH_SRCS)
%.s: %.c
$(CC) -S $(COMPILE_CFLAGS) $(_VPATH_SRCS)
%.i: %.cpp
$(CCC) -C -E $(COMPILE_CXXFLAGS) $(_VPATH_SRCS) > $*.i
%.i: %.cc
$(CCC) -C -E $(COMPILE_CXXFLAGS) $(_VPATH_SRCS) > $*.i
%.i: %.c
$(CC) -C -E $(COMPILE_CFLAGS) $(_VPATH_SRCS) > $*.i

1
gfx/src/thebes/Makefile.in
View File

@ -139,6 +139,7 @@ LOCAL_INCLUDES = \
$(NULL)
EXTRA_DSO_LDOPTS += \
$(MOZ_FIX_LINK_PATHS) \
../shared/$(LIB_PREFIX)gfxshared_s.$(LIB_SUFFIX) \
$(LIBS_DIR) \
$(EXTRA_DSO_LIBS) \

1
layout/build/Makefile.in
View File

@ -209,6 +209,7 @@ DEFINES += -DENABLE_EDITOR_API_LOG
endif
EXTRA_DSO_LDOPTS = \
$(MOZ_FIX_LINK_PATHS) \
$(LIBS_DIR) \
$(EXTRA_DSO_LIBS) \
$(MOZ_UNICHARUTIL_LIBS) \

1
xpcom/glue/Makefile.in
View File

@ -66,6 +66,7 @@ CSRCS = \
CPPSRCS = \
$(XPCOM_GLUE_SRC_LCPPSRCS) \
$(XPCOM_GLUENS_SRC_LCPPSRCS) \
nsStringAPI.cpp \
$(NULL)
SDK_HEADERS = \

4
xpcom/glue/nsINIParser.h
View File

@ -43,6 +43,10 @@
#ifndef nsINIParser_h__
#define nsINIParser_h__
#ifdef MOZILLA_INTERNAL_API
#define nsINIParser nsINIParser_internal
#endif
#include "nscore.h"
#include "nsClassHashtable.h"
#include "nsAutoPtr.h"

13
xpcom/glue/nsStringAPI.cpp
View File

@ -40,21 +40,10 @@
#include "nscore.h"
#include "nsCRTGlue.h"
#include "prprf.h"
#ifdef MOZILLA_INTERNAL_API
#undef nsAString
#undef nsACString
#endif
#include "nsStringAPI.h"
#include "nsXPCOMStrings.h"
#include "nsDebug.h"
#ifdef MOZILLA_INTERNAL_API
#undef MOZILLA_INTERNAL_API
#endif
#include "nsStringAPI.h"
#include <stdio.h>
#ifdef XP_WIN

1
xpcom/glue/objs.mk
View File

@ -57,7 +57,6 @@ XPCOM_GLUE_SRC_LCPPSRCS = \
nsWeakReference.cpp \
nsGREGlue.cpp \
nsVersionComparator.cpp \
nsStringAPI.cpp \
nsTHashtable.cpp \
nsQuickSort.cpp \
nsVoidArray.cpp \

3
xpcom/glue/standalone/Makefile.in
View File

@ -83,6 +83,7 @@ CSRCS = \
CPPSRCS = \
$(XPCOM_GLUE_SRC_LCPPSRCS) \
nsStringAPI.cpp \
nsXPCOMGlue.cpp \
$(LINKSRC) \
$(NULL)
@ -119,7 +120,7 @@ OS_COMPILE_CFLAGS += -Zl
DEFINES += -D_USE_ANSI_CPP
endif
export:: $(XPCOM_GLUE_SRC_CSRCS) $(XPCOM_GLUE_SRC_CPPSRCS)
export:: $(XPCOM_GLUE_SRC_CSRCS) $(XPCOM_GLUE_SRC_CPPSRCS) $(topsrcdir)/xpcom/glue/nsStringAPI.cpp
$(INSTALL) $^ .
DEFINES += -DXPCOM_GLUE