Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
dragonwell8_jdk
提交
f32913f4
D
dragonwell8_jdk
项目概览
openanolis
/
dragonwell8_jdk
通知
4
Star
2
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
D
dragonwell8_jdk
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
f32913f4
编写于
5月 30, 2012
作者:
K
katleman
浏览文件
操作
浏览文件
下载
差异文件
Merge
上级
877d6943
72d101a4
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
29 addition
and
21 deletion
+29
-21
make/sun/xawt/Makefile
make/sun/xawt/Makefile
+14
-7
makefiles/sun/xawt/Makefile
makefiles/sun/xawt/Makefile
+15
-7
src/share/native/sun/awt/image/cvutils/img_dcm.h
src/share/native/sun/awt/image/cvutils/img_dcm.h
+0
-2
src/share/native/sun/awt/image/cvutils/img_dcm8.h
src/share/native/sun/awt/image/cvutils/img_dcm8.h
+0
-2
src/share/native/sun/java2d/pipe/SpanClipRenderer.c
src/share/native/sun/java2d/pipe/SpanClipRenderer.c
+0
-1
src/solaris/native/sun/awt/initIDs.c
src/solaris/native/sun/awt/initIDs.c
+0
-2
未找到文件。
make/sun/xawt/Makefile
浏览文件 @
f32913f4
#
# Copyright (c) 2002, 201
1
, Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2002, 201
2
, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
...
...
@@ -225,10 +225,16 @@ ifeq ($(ARCH_DATA_MODEL), 32)
SIZERS
=
$(SIZER)
.32
SIZERS_C
=
$(SIZER_32_C)
SIZES
=
$(WRAPPER_GENERATOR_DIR)
/sizes.32
ifdef
CROSS_COMPILE_ARCH
CFLAGS_32
=
-m32
endif
else
# !32
SIZERS
=
$(SIZER)
.64
SIZERS_C
=
$(SIZER_64_C)
SIZES
=
$(WRAPPER_GENERATOR_DIR)
/sizes.64
ifdef
CROSS_COMPILE_ARCH
CFLAGS_64
=
-m64
endif
endif
# 32
endif
# !macosx
endif
# solaris
...
...
@@ -264,16 +270,17 @@ WRAPPER_GENERATOR_TEMPDIR=$(TEMPDIR)/sun/awt/X11/generator
WRAPPER_GENERATOR_CLASS
=
$(WRAPPER_GENERATOR_TEMPDIR)
/WrapperGenerator.class
XLIBTYPES
=
$(PLATFORM_SRC)
/classes/sun/awt/X11/generator/xlibtypes.txt
$(SIZERS)
:
$(SIZERS_C)
$
(
prep-target
)
ifndef
CROSS_COMPILE_ARCH
$(CC)
$
(
CFLAGS_
$(
subst
.,,
$(
suffix
$@
))
)
$(CPPFLAGS)
-c
-o
$(SIZER)
$(
suffix
$@
)
.o
$(SIZER)
$(
suffix
$@
)
.c
$(CC)
$
(
CFLAGS_
$(
subst
.,,
$(
suffix
$@
))
)
-o
$@
$(CPPFLAGS)
$(SIZER)
$(
suffix
$@
)
.o
SIZERS_CC
=
$(CC)
else
$(HOST_CC)
$(CPPFLAGS)
-c
-o
$(SIZER)
$(
suffix
$@
)
.o
$(SIZER)
$(
suffix
$@
)
.c
$(HOST_CC)
$(CPPFLAGS)
-o
$@
$(SIZER)
$(
suffix
$@
)
.o
SIZERS_CC
=
$(HOST_CC)
endif
$(SIZERS)
:
$(SIZERS_C)
$
(
prep-target
)
$(SIZERS_CC)
$
(
CFLAGS_
$(
subst
.,,
$(
suffix
$@
))
)
$(CPPFLAGS)
-c
-o
$(SIZER)
$(
suffix
$@
)
.o
$(SIZER)
$(
suffix
$@
)
.c
$(SIZERS_CC)
$
(
CFLAGS_
$(
subst
.,,
$(
suffix
$@
))
)
-o
$@
$(CPPFLAGS)
$(SIZER)
$(
suffix
$@
)
.o
$(WRAPPER_GENERATOR_CLASS)
:
$(WRAPPER_GENERATOR_JAVA)
$
(
prep-target
)
$(BOOT_JAVAC_CMD)
-d
$(WRAPPER_GENERATOR_TEMPDIR)
$(WRAPPER_GENERATOR_JAVA)
...
...
makefiles/sun/xawt/Makefile
浏览文件 @
f32913f4
#
# Copyright (c) 2002, 201
1
, Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2002, 201
2
, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
...
...
@@ -225,10 +225,16 @@ ifeq ($(ARCH_DATA_MODEL), 32)
SIZERS
=
$(SIZER)
.32
SIZERS_C
=
$(SIZER_32_C)
SIZES
=
$(WRAPPER_GENERATOR_DIR)
/sizes.32
ifdef
CROSS_COMPILE_ARCH
CFLAGS_32
=
-m32
endif
else
# !32
SIZERS
=
$(SIZER)
.64
SIZERS_C
=
$(SIZER_64_C)
SIZES
=
$(WRAPPER_GENERATOR_DIR)
/sizes.64
ifdef
CROSS_COMPILE_ARCH
CFLAGS_64
=
-m64
endif
endif
# 32
endif
# !macosx
endif
# solaris
...
...
@@ -264,16 +270,18 @@ WRAPPER_GENERATOR_TEMPDIR=$(TEMPDIR)/sun/awt/X11/generator
WRAPPER_GENERATOR_CLASS
=
$(WRAPPER_GENERATOR_TEMPDIR)
/WrapperGenerator.class
XLIBTYPES
=
$(PLATFORM_SRC)
/classes/sun/awt/X11/generator/xlibtypes.txt
$(SIZERS)
:
$(SIZERS_C)
$
(
prep-target
)
ifndef
CROSS_COMPILE_ARCH
$(CC)
$
(
CFLAGS_
$(
subst
.,,
$(
suffix
$@
))
)
$(CPPFLAGS)
-c
-o
$(SIZER)
$(
suffix
$@
)
.o
$(SIZER)
$(
suffix
$@
)
.c
$(CC)
$
(
CFLAGS_
$(
subst
.,,
$(
suffix
$@
))
)
-o
$@
$(CPPFLAGS)
$(SIZER)
$(
suffix
$@
)
.o
SIZERS_CC
=
$(CC)
else
$(HOST_CC)
$(CPPFLAGS)
-c
-o
$(SIZER)
$(
suffix
$@
)
.o
$(SIZER)
$(
suffix
$@
)
.c
$(HOST_CC)
$(CPPFLAGS)
-o
$@
$(SIZER)
$(
suffix
$@
)
.o
SIZERS_CC
=
$(HOST_CC)
endif
$(SIZERS)
:
$(SIZERS_C)
$
(
prep-target
)
$(SIZERS_CC)
$(CFLAGS_$(subst
.,,$(suffix
$@)))
$(CPPFLAGS)
-c
-o
$(SIZER)$(suffix
$@).o
$(SIZER)$(suffix
$@).c
$(SIZERS_CC)
$(CFLAGS_$(subst
.,,$(suffix
$@)))
-o
$@
$(CPPFLAGS)
$(SIZER)$(suffix
$@).o
$(WRAPPER_GENERATOR_CLASS)
:
$(WRAPPER_GENERATOR_JAVA)
$
(
prep-target
)
$(BOOT_JAVAC_CMD)
-d
$(WRAPPER_GENERATOR_TEMPDIR)
$(WRAPPER_GENERATOR_JAVA)
...
...
src/share/native/sun/awt/image/cvutils/img_dcm.h
浏览文件 @
f32913f4
...
...
@@ -52,8 +52,6 @@
#define DecodeDeclared
#endif
#include "java_awt_image_DirectColorModel.h"
#define DeclareDCMVars \
IfAlpha(int alpha_mask; \
int alpha_scale; \
...
...
src/share/native/sun/awt/image/cvutils/img_dcm8.h
浏览文件 @
f32913f4
...
...
@@ -52,8 +52,6 @@
#define DecodeDeclared
#endif
#include "java_awt_image_DirectColorModel.h"
#define DeclareDCM8Vars \
IfAlpha(unsigned int alpha_off;) \
unsigned int red_off, green_off, blue_off;
...
...
src/share/native/sun/java2d/pipe/SpanClipRenderer.c
浏览文件 @
f32913f4
...
...
@@ -31,7 +31,6 @@
#include "jni_util.h"
#include "sun_java2d_pipe_SpanClipRenderer.h"
#include "sun_java2d_pipe_RegionIterator.h"
jfieldID
pBandsArrayID
;
jfieldID
pEndIndexID
;
...
...
src/solaris/native/sun/awt/initIDs.c
浏览文件 @
f32913f4
...
...
@@ -26,14 +26,12 @@
#include "java_awt_Color.h"
#include "java_awt_Dimension.h"
#include "java_awt_MenuBar.h"
//#include "java_awt_Label.h"
#include "java_awt_FontMetrics.h"
#include "java_awt_event_MouseEvent.h"
#include "java_awt_Rectangle.h"
#include "java_awt_ScrollPaneAdjustable.h"
#include "java_awt_Toolkit.h"
#include "java_awt_CheckboxMenuItem.h"
#include "sun_awt_CharsetString.h"
#include "jni_util.h"
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录