equal
deleted
inserted
replaced
78 LDLIBS += user32.lib gdi32.lib $(OBJDIR)/../../../sun.awt/awt/$(OBJDIRNAME)/awt.lib |
78 LDLIBS += user32.lib gdi32.lib $(OBJDIR)/../../../sun.awt/awt/$(OBJDIRNAME)/awt.lib |
79 |
79 |
80 OTHER_CFLAGS += -DCC_NOEX |
80 OTHER_CFLAGS += -DCC_NOEX |
81 OTHER_CXXFLAGS += -DCC_NOEX |
81 OTHER_CXXFLAGS += -DCC_NOEX |
82 |
82 |
83 FILES_export += sun/java2d/d3d/D3DTextRenderer.java |
|
84 |
|
85 else # PLATFORM unix |
83 else # PLATFORM unix |
86 |
84 |
87 FILES_export += \ |
85 FILES_export += \ |
88 sun/font/NativeStrike.java \ |
86 sun/font/NativeStrike.java \ |
89 sun/font/NativeStrikeDisposer.java \ |
87 sun/font/NativeStrikeDisposer.java \ |
164 OTHER_LDLIBS += $(FREETYPE_LIB) |
162 OTHER_LDLIBS += $(FREETYPE_LIB) |
165 endif |
163 endif |
166 |
164 |
167 ifeq ($(PLATFORM), windows) |
165 ifeq ($(PLATFORM), windows) |
168 vpath %.cpp $(PLATFORM_SRC)/native/sun/windows |
166 vpath %.cpp $(PLATFORM_SRC)/native/sun/windows |
169 vpath %.cpp $(PLATFORM_SRC)/native/sun/java2d/d3d |
|
170 else # PLATFORM |
167 else # PLATFORM |
171 |
168 |
172 # |
169 # |
173 # Libraries to link, and other C flags. |
170 # Libraries to link, and other C flags. |
174 # |
171 # |
199 -I$(PLATFORM_SRC)/native/sun/java2d \ |
196 -I$(PLATFORM_SRC)/native/sun/java2d \ |
200 -I$(SHARE_SRC)/native/sun/java2d \ |
197 -I$(SHARE_SRC)/native/sun/java2d \ |
201 -I$(TEMPDIR)/../../sun.awt/awt/CClassHeaders |
198 -I$(TEMPDIR)/../../sun.awt/awt/CClassHeaders |
202 |
199 |
203 ifeq ($(PLATFORM), windows) |
200 ifeq ($(PLATFORM), windows) |
204 CPPFLAGS += -I$(PLATFORM_SRC)/native/sun/windows \ |
201 CPPFLAGS += -I$(PLATFORM_SRC)/native/sun/windows |
205 -I$(PLATFORM_SRC)/native/sun/java2d/d3d |
202 endif |
206 endif |
203 |
207 |
|