Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixing mingw issues. bugs 331287, 331329, 331333. patches from cls and hans-andreas engel. r=me

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@193153 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
pavlov%pavlov.net 2006-03-28 21:15:01 +00:00
parent 5acd4f0365
commit 5976687725
5 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mozilla/gfx/cairo/cairo/src/cairo-platform.h
View File

@ -37,7 +37,7 @@
#ifndef CAIRO_PLATFORM_H
#define CAIRO_PLATFORM_H
#if defined(_MSC_VER)
#if defined(XP_WIN)
#define cairo_public extern __declspec(dllexport)
#define CCALLBACK

3
mozilla/gfx/src/thebes/Makefile.in
View File

@ -110,6 +110,9 @@ CPPSRCS += nsSystemFontsWin.cpp \
REQUIRES += glitzwgl
_OS_LIBS = usp10
ifdef GNU_CXX
_OS_LIBS += gdi32
endif
OS_LIBS += $(call EXPAND_LIBNAME,$(_OS_LIBS))
endif

5
mozilla/gfx/thebes/src/Makefile.in
View File

@ -9,7 +9,7 @@ include $(DEPTH)/config/autoconf.mk
MODULE = thebes
LIBRARY_NAME = thebes
LIBXUL_LIBRARY = 1
EXPORT_LIBRARAY = 1
EXPORT_LIBRARY = 1
REQUIRES = \
cairo \
@ -44,6 +44,9 @@ CPPSRCS += gfxWindowsFonts.cpp \
$(NULL)
_OS_LIBS = usp10 ole32
ifdef GNU_CXX
_OS_LIBS += gdi32 uuid
endif
OS_LIBS += $(call EXPAND_LIBNAME,$(_OS_LIBS))
ACDEFINES += -UWIN32_LEAN_AND_MEAN

6
mozilla/layout/build/Makefile.in
View File

@ -219,6 +219,12 @@ EXTRA_DSO_LDOPTS += $(MOZ_CAIRO_LIBS)
endif
endif
ifeq (WINNT,$(OS_ARCH))
ifdef GNU_CXX
OS_LIBS += $(call EXPAND_LIBNAME,gdi32)
endif
endif
ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
EXTRA_DSO_LDOPTS += \
$(TK_LIBS) \

4
mozilla/widget/src/build/Makefile.in
View File

@ -87,10 +87,6 @@ SHARED_LIBRARY_LIBS = \
$(DIST)/lib/$(LIB_PREFIX)xpwidgets_s.$(LIB_SUFFIX) \
$(NULL)
ifdef MOZ_ENABLE_CAIRO_GFX
SHARED_LIBRARY_LIBS += $(DIST)/lib/$(LIB_PREFIX)thebes.$(LIB_SUFFIX)
endif
EXTRA_DSO_LDOPTS = \
$(LIBS_DIR) \
$(EXTRA_DSO_LIBS) \