Ignore:
Timestamp:
Apr 9, 2009, 9:39:27 PM (10 years ago)
Author:
rme
Message:

Merge r11785 (build win32 kernel with mingw/msys, too) from trunk.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • release/1.3/source/lisp-kernel/win32/Makefile

    r10994 r11920  
    3636HASH_STYLE="-Wl,--hash-style=sysv"
    3737endif
     38
     39CRT2 = $(shell $(CC) -mno-cygwin -print-file-name=crt2.o)
    3840
    3941# There may be some confusion about whether or not C symbols have
     
    7779# reference them.  (It's legal to use -lfoo multiple times to try to
    7880# work around this.)
    79 OSLIBS = /usr/i686-pc-mingw32/lib/crt2.o -L/usr/lib/w32api \
    80         -L/usr/i686-pc-mingw32/lib  -lm -lpsapi -lws2_32  \
    81         -lmingw32 -lmoldname -lmingwex -lmsvcrt -lkernel32
    82 LIBGCC = $(shell gcc -mno-cygwin -print-libgcc-file-name)
     81LIBGCC = $(shell $(CC) -mno-cygwin -print-libgcc-file-name)
     82OSLIBS =  -L/usr/lib/w32api -L/mingw/lib -L/usr/lib/mingw\
     83        -lm -lpsapi -lws2_32 -lmingw32 $(LIBGCC) -lmoldname -lmingwex \
     84        -lmsvcrt -luser32 -lkernel32 -ladvapi32 -lshell32  $(GCCLIB) \
     85        -lmoldname -lmingwex -lmsvcrt
     86
     87
     88
    8389IMAGE_BASE =--image-base=0x10000
    8490
    8591../../wx86cl.exe: $(KSPOBJ) $(KERNELOBJ) $(DEBUGOBJ) Makefile
    86         ld -o ../../wx86cl.exe  $(IMAGE_BASE) \
    87         $(KSPOBJ) $(KERNELOBJ) $(DEBUGOBJ) $(OSLIBS) $(LIBGCC)
    88 
     92        ld -o ../../wx86cl.exe  $(IMAGE_BASE) --enable-auto-import \
     93        $(KSPOBJ) $(KERNELOBJ) $(DEBUGOBJ) $(CRT2) $(OSLIBS) $(LIBGCC) $(LATELIBS)
    8994
    9095
Note: See TracChangeset for help on using the changeset viewer.