Changeset d3c2f9 in git


Ignore:
Timestamp:
Jul 20, 2005, 9:57:25 AM (19 years ago)
Author:
Oliver Wienand <wienand@…>
Branches:
(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'd25190065115c859833252500a64cfb7b11e3a50')
Children:
4e819500ba1aa0c2558af540e642e5040a966222
Parents:
45d41f270d6bca4d6f63e8ee086487ef5f790d03
Message:
Makefile.in
---> p_Procs_Dynamic wird nicht bei ixWin gebaut
---> gmp und ncurses werden dynamisch gelinkt auf ixWin immer

sing_win.cc
--> Expliziten type cast gesetzt


git-svn-id: file:///usr/local/Singular/svn/trunk@8434 2c84dea3-7e68-4137-9b89-c4e89433aadc
Location:
kernel
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • kernel/Makefile.in

    r45d41f rd3c2f9  
    3737BISON           = bison
    3838INSTALL         = @INSTALL@
    39 INSTALL_PROGRAM = @INSTALL_PROGRAM@ 
     39INSTALL_PROGRAM = @INSTALL_PROGRAM@
    4040INSTALL_DATA    = @INSTALL_DATA@
    4141MKINSTALLDIRS   = ./mkinstalldirs
     
    7373ifdef LD_STATIC
    7474LDFLAGS  := ${STATIC_LDFLAGS} ${LDFLAGS}
    75 LIBS := ${MP_LIBS} ${LIBS} 
     75LIBS := ${MP_LIBS} ${LIBS}
    7676DL_KERNEL =
    7777else
     
    116116
    117117# normal C source files
    118 CSOURCES=weight0.c fegetopt.c fereadl.c dError.c mmstd.c 
     118CSOURCES=weight0.c fegetopt.c fereadl.c dError.c mmstd.c
    119119
    120120# C++ sources which are used if part of the kernel are dynamically linked
    121 DL_KERNEL_SOURCES=p_Procs_Dynamic.cc
     121ifeq ($(DL_KERNEL),1)
     122DL_KERNEL_SOURCES=p_Procs_Dynamic.cc
     123else
     124DL_KERNEL_SOURCES=
     125endif
    122126
    123127# C++ sources which are used for dynamic libraries if part of the kernel is
    124128# dynamically linked
    125 DL_LIB_SOURCES=p_Procs_Lib.cc 
     129DL_LIB_SOURCES=p_Procs_Lib.cc
    126130
    127131# C++ sources which are used if no parts of the kernel are dynamically linked
    128 STATIC_SOURCES=p_Procs_Static.cc 
     132STATIC_SOURCES=p_Procs_Static.cc
    129133
    130134# special C++ source files (need extra compiling and/or linking), for which
    131135# dependencies should be generated
    132 ESOURCES=mmalloc.cc $(DL_KERNEL_SOURCES) $(DL_LIB_SOURCES) $(STATIC_SOURCES) 
     136ESOURCES=mmalloc.cc $(DL_KERNEL_SOURCES) $(DL_LIB_SOURCES) $(STATIC_SOURCES)
    133137
    134138SOURCES=${CSOURCES} ${CXXSOURCES} \
     
    181185ifeq ($(DL_KERNEL),1)
    182186OBJS    := $(OBJS) $(DL_KERNEL_SOURCES:.cc=.o)
    183 DL_LIBS := $(P_PROCS_MODULES:%=p_Procs_%.so) 
     187DL_LIBS := $(P_PROCS_MODULES:%=p_Procs_%.so)
    184188else
    185189ifndef LD_STATIC
     
    236240
    237241OBJG := $(OBJG) $(DL_KERNEL_SOURCES:.cc=.og)
    238 DL_LIBSG := $(P_PROCS_MODULES:%=p_Procs_%.sog) 
     242DL_LIBSG := $(P_PROCS_MODULES:%=p_Procs_%.sog)
    239243
    240244OBJP := $(OBJP) $(DL_KERNEL_SOURCES:.cc=.op)
     
    248252
    249253OBJA := $(OBJA) $(DL_KERNEL_SOURCES:.cc=.oa)
    250 DL_LIBSA := $(P_PROCS_MODULES:%=p_Procs_%.soa) 
     254DL_LIBSA := $(P_PROCS_MODULES:%=p_Procs_%.soa)
    251255
    252256else
     
    288292
    289293# additional dependencies for p_Procs_[Static|Dynamic|Lib].cc
    290 p_Procs_Static.o: p_Procs_Static.inc 
    291 p_Procs_Static.inc: p_Procs_Static.h 
     294p_Procs_Static.o: p_Procs_Static.inc
     295p_Procs_Static.inc: p_Procs_Static.h
    292296p_Procs_Dynamic.o p_Procs_Lib.o: p_Procs_Dynamic.inc
    293297p_Procs_Dynamic.inc p_Procs_Lib.inc: p_Procs_Dynamic.h
    294298
    295299# here is how p_Procs_[Static|Dynamic].inc is generated
    296 p_Procs_%.inc: p_Procs_Generate.cc p_Procs_Impl.h mod2.h 
     300p_Procs_%.inc: p_Procs_Generate.cc p_Procs_Impl.h mod2.h
    297301        $(CXX) -g -Wall -Dp_Procs_$* p_Procs_Generate.cc -o p_Procs_$*
    298302        ./p_Procs_$* > p_Procs_$*.inc
     
    341345
    342346clean: mostlyclean
    343         -rm -f *.bak *.d *.dd depend 
     347        -rm -f *.bak *.d *.dd depend
    344348
    345349distclean: clean
     
    393397
    394398OBJA1 := $(CXXSOURCES:.cc=.oa)
    395 OBJA2 := $(CSOURCES:.c=.oa) 
     399OBJA2 := $(CSOURCES:.c=.oa)
    396400
    397401
  • kernel/sing_win.cc

    r45d41f rd3c2f9  
    5959  FARPROC f;
    6060  f = GetProcAddress((HINSTANCE)handle, TEXT (symbol));
    61   return(f);
     61  return((void*) f);
    6262}
    6363
Note: See TracChangeset for help on using the changeset viewer.