Changeset d3c2f9 in git

Timestamp:

Jul 20, 2005, 9:57:25 AM (18 years ago)

Author:

Oliver Wienand <wienand@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')

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:

• Makefile.in (modified) (9 diffs)
• sing_win.cc (modified) (1 diff)

kernel/Makefile.in

@@ -37 +37 @@
 BISON           = bison
 INSTALL         = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ 
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA    = @INSTALL_DATA@
 MKINSTALLDIRS   = ./mkinstalldirs
@@ -73 +73 @@
 ifdef LD_STATIC
 LDFLAGS  := ${STATIC_LDFLAGS} ${LDFLAGS} 
-LIBS := ${MP_LIBS} ${LIBS} 
+LIBS := ${MP_LIBS} ${LIBS}
 DL_KERNEL =
 else
@@ -116 +116 @@
 
 # normal C source files
-CSOURCES=weight0.c fegetopt.c fereadl.c dError.c mmstd.c 
+CSOURCES=weight0.c fegetopt.c fereadl.c dError.c mmstd.c
 
 # C++ sources which are used if part of the kernel are dynamically linked
-DL_KERNEL_SOURCES=p_Procs_Dynamic.cc 
+ifeq ($(DL_KERNEL),1)
+DL_KERNEL_SOURCES=p_Procs_Dynamic.cc
+else
+DL_KERNEL_SOURCES=
+endif
 
 # C++ sources which are used for dynamic libraries if part of the kernel is
 # dynamically linked
-DL_LIB_SOURCES=p_Procs_Lib.cc 
+DL_LIB_SOURCES=p_Procs_Lib.cc
 
 # C++ sources which are used if no parts of the kernel are dynamically linked
-STATIC_SOURCES=p_Procs_Static.cc 
+STATIC_SOURCES=p_Procs_Static.cc
 
 # special C++ source files (need extra compiling and/or linking), for which
 # dependencies should be generated
-ESOURCES=mmalloc.cc $(DL_KERNEL_SOURCES) $(DL_LIB_SOURCES) $(STATIC_SOURCES) 
+ESOURCES=mmalloc.cc $(DL_KERNEL_SOURCES) $(DL_LIB_SOURCES) $(STATIC_SOURCES)
 
 SOURCES=${CSOURCES} ${CXXSOURCES} \
@@ -181 +185 @@
 ifeq ($(DL_KERNEL),1)
 OBJS    := $(OBJS) $(DL_KERNEL_SOURCES:.cc=.o)
-DL_LIBS := $(P_PROCS_MODULES:%=p_Procs_%.so) 
+DL_LIBS := $(P_PROCS_MODULES:%=p_Procs_%.so)
 else
 ifndef LD_STATIC
@@ -236 +240 @@
 
 OBJG := $(OBJG) $(DL_KERNEL_SOURCES:.cc=.og)
-DL_LIBSG := $(P_PROCS_MODULES:%=p_Procs_%.sog) 
+DL_LIBSG := $(P_PROCS_MODULES:%=p_Procs_%.sog)
 
 OBJP := $(OBJP) $(DL_KERNEL_SOURCES:.cc=.op)
@@ -248 +252 @@
 
 OBJA := $(OBJA) $(DL_KERNEL_SOURCES:.cc=.oa)
-DL_LIBSA := $(P_PROCS_MODULES:%=p_Procs_%.soa) 
+DL_LIBSA := $(P_PROCS_MODULES:%=p_Procs_%.soa)
 
 else
@@ -288 +292 @@
 
 # additional dependencies for p_Procs_[Static|Dynamic|Lib].cc
-p_Procs_Static.o: p_Procs_Static.inc 
-p_Procs_Static.inc: p_Procs_Static.h 
+p_Procs_Static.o: p_Procs_Static.inc
+p_Procs_Static.inc: p_Procs_Static.h
 p_Procs_Dynamic.o p_Procs_Lib.o: p_Procs_Dynamic.inc
 p_Procs_Dynamic.inc p_Procs_Lib.inc: p_Procs_Dynamic.h
 
 # here is how p_Procs_[Static|Dynamic].inc is generated
-p_Procs_%.inc: p_Procs_Generate.cc p_Procs_Impl.h mod2.h 
+p_Procs_%.inc: p_Procs_Generate.cc p_Procs_Impl.h mod2.h
         $(CXX) -g -Wall -Dp_Procs_$* p_Procs_Generate.cc -o p_Procs_$*
         ./p_Procs_$* > p_Procs_$*.inc
@@ -341 +345 @@
 
 clean: mostlyclean
-        -rm -f *.bak *.d *.dd depend 
+        -rm -f *.bak *.d *.dd depend
 
 distclean: clean
@@ -393 +397 @@
 
 OBJA1 := $(CXXSOURCES:.cc=.oa) 
-OBJA2 := $(CSOURCES:.c=.oa) 
+OBJA2 := $(CSOURCES:.c=.oa)
 
 

kernel/sing_win.cc

@@ -59 +59 @@
   FARPROC f;
   f = GetProcAddress((HINSTANCE)handle, TEXT (symbol));
-  return(f);
+  return((void*) f);
 }