Changeset 120 for trunk


Ignore:
Timestamp:
Jan 1, 2002, 8:19:33 PM (24 years ago)
Author:
dmik
Message:

make: Use debug or release Odin libraries automatically, depending on the Java build (debug or product).

Location:
trunk/openjdk
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/openjdk/hotspot/make/os2/makefiles/compile.make

    r119 r120  
    6464CPP_FLAGS += -I$(ALT_ODINSDK_PATH)/include/Win -I$(ALT_ODINSDK_PATH)/include
    6565
    66 LINK_FLAGS  += -L$(ALT_ODINSDK_PATH)/lib -L$(ALT_ODINSDK_PATH)/lib/Release \
    67                            -lkernel32.lib -luser32.lib -lgdi32.lib -lwinspool.lib \
     66PRODUCT_LINK_FLAGS      += -L$(ALT_ODINSDK_PATH)/lib/Release -L$(ALT_ODINSDK_PATH)/lib
     67FASTDEBUG_LINK_FLAGS    += -L$(ALT_ODINSDK_PATH)/lib/Debug -L$(ALT_ODINSDK_PATH)/lib
     68DEBUG_LINK_FLAGS        += -L$(ALT_ODINSDK_PATH)/lib/Debug -L$(ALT_ODINSDK_PATH)/lib
     69
     70LINK_FLAGS  += -lkernel32.lib -luser32.lib -lgdi32.lib -lwinspool.lib \
    6871               -lcomdlg32.lib -ladvapi32.lib -lshell32.lib -lole32.lib \
    6972               -loleaut32.lib -lWsock32.lib -lwinmm.lib \

  • trunk/openjdk/hotspot/make/os2/makefiles/debug.make

    r113 r120  
    3535
    3636CXX_FLAGS += $(DEBUG_OPT_OPTION)
     37LINK_FLAGS += $(DEBUG_LINK_FLAGS)
    3738
    3839include $(WorkSpace)/make/os2/makefiles/vm.make

  • trunk/openjdk/hotspot/make/os2/makefiles/product.make

    r113 r120  
    3434
    3535CXX_FLAGS += $(PRODUCT_OPT_OPTION)
     36LINK_FLAGS += $(PRODUCT_LINK_FLAGS)
    3637
    3738RELEASE =

  • trunk/openjdk/jdk/make/common/Defs-os2.gmk

    r119 r120  
    154154CPPFLAGS_COMMON += -I$(ODINSDK_PATH)/include/Win -I$(ODINSDK_PATH)/include \
    155155                   -DWINE_LARGE_INTEGER
    156 LDFLAGS_COMMON  += -L$(ODINSDK_PATH)/lib -L$(ODINSDK_PATH)/lib/Release \
    157                                    -lkernel32.lib -luser32.lib -ladvapi32.lib \
     156
     157LDFLAGS_OPT     += -L$(ODINSDK_PATH)/lib/Release -L$(ODINSDK_PATH)/lib
     158LDFLAGS_DBG     += -L$(ODINSDK_PATH)/lib/Debug -L$(ODINSDK_PATH)/lib
     159LDFLAGS_COMMON  += -lkernel32.lib -luser32.lib -ladvapi32.lib \
    158160                                   -lminivcrt.lib -lntdll.lib
    159161
Note: See TracChangeset for help on using the changeset viewer.