Changeset 208


Ignore:
Timestamp:
Dec 10, 2010, 5:58:20 PM (15 years ago)
Author:
dmik
Message:

jdk: Made build splashscreen.dll, jpeg.dll, lcms.dll.

Location:
trunk/openjdk/jdk
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • trunk/openjdk/jdk/make/sun/cmm/kcms/Makefile

    r74 r208  
    8585vpath %.c   $(CLOSED_SRC)/share/native/$(PKGDIR)
    8686
    87 ifeq ($(filter-out windows os2, $(PLATFORM)),)
     87ifeq ($(PLATFORM), windows)
    8888
    8989OTHER_LDLIBS = user32.lib version.lib
    … …  
    9797
    9898else # PLATFORM
     99ifeq ($(PLATFORM), os2)
     100
     101OTHER_LDLIBS = -luser32.lib -lversion.lib
     102
     103else # PLATFORM
    99104OTHER_LDLIBS = $(LIBM)
    100105
    … …  
    105110
    106111endif # PLATFORM
     112endif # PLATFORM
    107113
    108114#CFLAGS += -DJAVACMM -DFUT_CALC_EX -DNO_FUT_GCONST

  • trunk/openjdk/jdk/make/sun/cmm/lcms/Makefile

    r2 r208  
    3434# Files
    3535#
    36 ifeq ($(PLATFORM), windows)
     36ifeq ($(filter-out windows os2,$(PLATFORM)),)
    3737include FILES_c_windows.gmk
    3838else # PLATFORM
    … …  
    9393
    9494else
     95ifeq ($(PLATFORM), os2)
     96
     97OTHER_LDLIBS = -luser32.lib -lversion.lib -l$(OBJDIR)/../../../sun.awt/awt/$(OBJDIRNAME)/awt.lib
     98OTHER_INCLUDES += -I$(SHARE_SRC)/native/sun/java2d \
     99                  -I$(SHARE_SRC)/native/sun/awt/debug
     100
     101else
    95102OTHER_LDLIBS = $(LIBM) -lawt -L$(LIBDIR)/$(LIBARCH)/xawt
    96103CPPFLAGS += -I$(SHARE_SRC)/native/sun/java2d \
    97104            -I$(SHARE_SRC)/native/sun/awt/debug
    98105endif
    99 
     106endif

  • trunk/openjdk/jdk/make/sun/splashscreen/Makefile

    r74 r208  
    2929PRODUCT = sun
    3030include $(BUILDDIR)/common/Defs.gmk
     31
     32LIBRARY_SHORT = splshscr
    3133
    3234#
    … …  
    6769  OTHER_LDLIBS += -L$(OPENWIN_LIB) -lX11 -lXext $(LIBM) -lpthread
    6870else # PLATFORM
     71ifeq ($(PLATFORM), windows)
    6972  CFLAGS += -DWITH_WIN32
    7073  OTHER_LDLIBS += kernel32.lib user32.lib gdi32.lib
    7174#$(JVMLIB) $(OBJDIR)/../../jpeg/$(OBJDIRNAME)/jpeg$(SUFFIX).lib
     75else # PLATFORM = os2
     76  CFLAGS += -DWITH_WIN32
     77  OTHER_LDLIBS += -lkernel32.lib -luser32.lib -lgdi32.lib
     78endif # PLATFORM
    7279endif # PLATFORM
    7380

  • trunk/openjdk/jdk/src/share/classes/java/awt/SplashScreen.java

    r2 r208  
    109109            // SplashScreen class is now a singleton
    110110            if (!wasClosed && theInstance == null) {
    111                 java.security.AccessController.doPrivileged(
     111                if (System.getProperty("os.name").startsWith("OS/2")) {
     112                    java.security.AccessController.doPrivileged(
     113                        new sun.security.action.LoadLibraryAction("splshscr"));
     114                } else {
     115                    java.security.AccessController.doPrivileged(
    112116                        new sun.security.action.LoadLibraryAction("splashscreen"));
     117                }
    113118                long ptr = _getInstance();
    114119                if (ptr != 0 && _isVisible(ptr)) {

  • trunk/openjdk/jdk/src/share/native/sun/awt/image/jpeg/jmorecfg.h

    r2 r208  
    127127
    128128
     129#if !defined(__WIN32OS2__) || !defined(__WINE_BASETSD_H)
     130
    129131/* These typedefs are used for various table entries and so forth.
    130132 * They must be at least as wide as specified; but making them too big
    … …  
    169171#endif
    170172#endif
     173
     174#endif /* !defined(__WIN32OS2__) || !defined(__WINE_BASETSD_H) */
    171175
    172176/* Datatype used for image dimensions.  The JPEG standard only supports

  • trunk/openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/LCMS.c

    r2 r208  
    120120}
    121121
    122 JNIEXPORT int JNICALL JNI_OnLoad(JavaVM *jvm, void *reserved) {
     122JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *jvm, void *reserved) {
    123123    javaVM = jvm;
    124124
    … …  
    457457{
    458458    storeID_t sTrans;
    459     int size, inFmt, outFmt, srcDType, dstDType, outSize, renderType;
     459    int size, inFmt, outFmt, outSize, renderType;
     460    jint srcDType, dstDType;
    460461    int srcOffset, srcNextRowOffset, dstOffset, dstNextRowOffset;
    461462    int width, height, i;

  • trunk/openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/lcms.h

    r2 r208  
    117117#endif
    118118
     119#ifdef __WIN32OS2__
     120#    undef NON_WINDOWS
     121#endif
     122
    119123// Borland C
    120124
    … …  
    263267#include <windows.h>
    264268
    265 #ifdef _WIN64
     269#if defined(__WIN32OS2__)
     270#   include <string.h>
     271#endif
     272
     273#if defined(_WIN64) || defined(__WIN32OS2__)
    266274# ifdef USE_ASSEMBLER
    267275#    undef  USE_ASSEMBLER
    … …  
    277285#endif
    278286
     287#ifndef __GNUC__
    279288// This works for both VC & BorlandC
    280289#define LCMS_INLINE __inline
     290#else
     291#define LCMS_INLINE static inline
     292#endif
    281293
    282294#ifdef USE_PTHREADS

  • trunk/openjdk/jdk/src/windows/native/sun/awt/splashscreen/splashscreen_config.h

    r2 r208  
    5353#define RECT_INC_HEIGHT(r) (r).bottom++;
    5454
     55#ifndef INLINE
    5556#define INLINE __inline
     57#endif
    5658
    5759#define SPLASHEXPORT __declspec(dllexport)

  • trunk/openjdk/jdk/src/windows/native/sun/awt/splashscreen/splashscreen_sys.c

    r2 r208  
    2929#include <winuser.h>
    3030
     31#ifdef __EMX__
     32#include <alloca.h>
     33#endif
     34
    3135/* layered windows api prototypes. wouldn't be needed if we could use an updated version of the MS PSDK. */
    3236
    … …  
    6872#define GWLP_USERDATA GWL_USERDATA
    6973#define GWLP_WNDPROC  GWL_WNDPROC
     74#if !defined(__WIN32OS2__)
    7075typedef __int32 LONG_PTR;
    7176typedef unsigned __int32 ULONG_PTR;
     77#endif
    7278#endif // __int3264
    7379
Note: See TracChangeset for help on using the changeset viewer.