bc.mak
changeset 3776 1a2b51b35b25
parent 3769 8b2c403e95ef
parent 3732 1b2e154d77a5
child 3786 5955382113e0
equal deleted inserted replaced
3775:2d8b22d7134d 3776:1a2b51b35b25
    31 
    31 
    32 LIBNAME=libstx_libjava
    32 LIBNAME=libstx_libjava
    33 MODULE_PATH=libjava
    33 MODULE_PATH=libjava
    34 RESFILES=stx_libjavaWINrc.$(RES)
    34 RESFILES=stx_libjavaWINrc.$(RES)
    35 
    35 
       
    36     
       
    37 !if defined(USEMINGW32) || defined(USEMINGW64)
       
    38 ! if defined(USEMINGW32)
       
    39 LIBFDM_TARGET = i686-pc-mingw32
       
    40 ! else 
       
    41 LIBFDM_TARGET = x86_64-w64-mingw32
       
    42 ! endif
       
    43 LIBFDM=support\fdlibm\$(LIBFDM_TARGET)\libfdm.a
       
    44 !else
       
    45 LIBFDM=$(LIBFDM_DIR)\fdlibm\libfdm.a
       
    46 !endif
       
    47 
       
    48 
    36 
    49 
    37 
    50 
    38 LOCALINCLUDES=-I$(ZLIB_DIR) -Isupport\fdlibm -I$(INCLUDE_TOP)\stx\libbasic -I$(INCLUDE_TOP)\stx\libbasic2 -I$(INCLUDE_TOP)\stx\libbasic3 -I$(INCLUDE_TOP)\stx\libcomp -I$(INCLUDE_TOP)\stx\libhtml -I$(INCLUDE_TOP)\stx\libtool -I$(INCLUDE_TOP)\stx\libview -I$(INCLUDE_TOP)\stx\libview2 -I$(INCLUDE_TOP)\stx\libwidg -I$(INCLUDE_TOP)\stx\libwidg2
    51 LOCALINCLUDES=-I$(ZLIB_DIR) -Isupport\fdlibm -I$(INCLUDE_TOP)\stx\libbasic -I$(INCLUDE_TOP)\stx\libbasic2 -I$(INCLUDE_TOP)\stx\libbasic3 -I$(INCLUDE_TOP)\stx\libcomp -I$(INCLUDE_TOP)\stx\libhtml -I$(INCLUDE_TOP)\stx\libtool -I$(INCLUDE_TOP)\stx\libview -I$(INCLUDE_TOP)\stx\libview2 -I$(INCLUDE_TOP)\stx\libwidg -I$(INCLUDE_TOP)\stx\libwidg2
    39 LOCALDEFINES=
    52 LOCALDEFINES=
    40 
    53 
    41 STCLOCALOPT=-package=$(PACKAGE) -I. $(LOCALINCLUDES) -headerDir=. $(STCLOCALOPTIMIZATIONS) $(STCWARNINGS) $(LOCALDEFINES)  -varPrefix=$(LIBNAME)
    54 STCLOCALOPT=-package=$(PACKAGE) -I. $(LOCALINCLUDES) -headerDir=. $(STCLOCALOPTIMIZATIONS) $(STCWARNINGS) $(LOCALDEFINES)  -varPrefix=$(LIBNAME)
    42 LOCALLIBS=$(ZLIB_DIR)\$(ZLIB) support\fdlibm\libfdm.lib
    55 LOCALLIBS=$(ZLIB_DIR)\$(ZLIB) $(LIBFDM)
    43 
    56 
    44 OBJS= $(COMMON_OBJS) $(WIN32_OBJS)
    57 OBJS= $(COMMON_OBJS) $(WIN32_OBJS)
    45 
    58 
    46 ALL:: $(ZLIB) support\fdlibm\libfdm.lib classLibRule
    59 ALL:: $(ZLIB) $(LIBFDM) classLibRule
    47 
    60 
    48 classLibRule: $(OUTDIR) $(OUTDIR)$(LIBNAME).dll
    61 classLibRule: $(OUTDIR) $(OUTDIR)$(LIBNAME).dll
    49 
    62 
    50 !INCLUDE $(TOP)\rules\stdRules_bc
    63 !INCLUDE $(TOP)\rules\stdRules_bc
    51 
    64 
    91 	cd $(BZ2LIB_DIR)
   104 	cd $(BZ2LIB_DIR)
    92 	$(MAKE) $(MAKE_BZ2LIB_ARG) bz2.lib
   105 	$(MAKE) $(MAKE_BZ2LIB_ARG) bz2.lib
    93 	cd ..\..\libjava
   106 	cd ..\..\libjava
    94 
   107 
    95 !ifdef USEMINGW64
   108 !ifdef USEMINGW64
    96 support\fdlibm\libfdm.lib:
   109 $(LIBFDM):
    97 	cd support\fdlibm
   110     set "PATH=C:\MSYS64\usr\bin;C:\MINGW\MSYS\1.0\bin;C:\MSYS\1.0\bin;%%PATH%%" & make -C support\fdlibm OUTDIR=$(LIBFDM_TARGET)
    98 	$(MAKE) -f Makefile.mingw64
       
    99 	cd ..\..
       
   100 !else
   111 !else
   101 ! ifdef USEMINGW32
   112 ! ifdef USEMINGW32
   102 support\fdlibm\libfdm.lib:
   113 $(LIBFDM):
   103 	cd support\fdlibm
   114     set "PATH=C:\MSYS64\usr\bin;C:\MINGW\MSYS\1.0\bin;C:\MSYS\1.0\bin;%%PATH%%" & make -C support\fdlibm OUTDIR=$(LIBFDM_TARGET)
   104 	$(MAKE) -f Makefile.mingw32
       
   105 	cd ..\..
       
   106 ! else
   115 ! else
   107 support\fdlibm\libfdm.lib:
   116 $(LIBFDM):
   108 	cd support\fdlibm
   117     set "PATH=C:\MSYS64\usr\bin;C:\MINGW\MSYS\1.0\bin;C:\MSYS\1.0\bin;%%PATH%%" & make -C support\fdlibm
   109 	$(MAKE) -f Makefile.bcc
       
   110 	cd ..\..
       
   111 ! endif
   118 ! endif
   112 !endif         
   119 !endif         
   113 
   120 
   114 
   121 
   115 
   122