Makefile.vc in gumath-0.2.0dev8

- old
+ new

@@ -25,28 +25,35 @@
 LIBXNDDIR = ..\xnd\libxnd
 !endif
 
 OPT = /MT /Ox /GS /EHsc /fp:strict
 OPT_SHARED = /DGM_EXPORT /DNDT_IMPORT /DXND_IMPORT /MD /Ox /GS /EHsc /fp:strict /Fo.objs^\
+OPT_NOFP = /MT /Ox /GS /EHsc
+OPT_SHARED_NOFP = /DGM_EXPORT /DNDT_IMPORT /DXND_IMPORT /MD /Ox /GS /EHsc /Fo.objs^\
 
 COMMON_CFLAGS = /nologo /W4 /wd4200 /wd4201 /wd4204
 CFLAGS = $(COMMON_CFLAGS) $(OPT)
 CFLAGS_SHARED = $(COMMON_CFLAGS) $(OPT_SHARED)
+CFLAGS_NOFP = $(COMMON_CFLAGS) $(OPT_NOFP)
+CFLAGS_SHARED_NOFP = $(COMMON_CFLAGS) $(OPT_SHARED_NOFP)
 
 
 default: $(LIBSTATIC) $(LIBSHARED)
 	copy /y gumath.h ..\python\gumath
 	copy /y $(LIBSTATIC) ..\python\gumath
 	copy /y $(LIBIMPORT) ..\python\gumath
 	copy /y $(LIBSHARED) ..\python\gumath
 
 
-OBJS = apply.obj func.obj nploops.obj tbl.obj xndloops.obj \
-       unary.obj binary.obj examples.obj graph.obj pdist.obj
+OBJS = apply.obj func.obj nploops.obj tbl.obj xndloops.obj cpu_host_unary.obj \
+       cpu_device_unary.obj cpu_host_binary.obj cpu_device_binary.obj cpu_device_msvc.obj \
+       common.obj examples.obj graph.obj pdist.obj
 
 SHARED_OBJS = .objs/apply.obj .objs/func.obj .objs/nploops.obj .objs/tbl.obj .objs/xndloops.obj \
-              .objs/unary.obj .objs/binary.obj .objs/examples.obj .objs/graph.obj .objs/pdist.obj
+              .objs/cpu_host_unary.obj .objs/cpu_device_unary.obj .objs/cpu_host_binary.obj \
+              .objs/cpu_device_binary.obj .objs/cpu_device_msvc.obj .objs/common.obj \
+              .objs/examples.obj .objs/graph.obj .objs/pdist.obj
 
 
 $(LIBSTATIC):\
 Makefile $(OBJS)
 	-@if exist $@ del $(LIBSTATIC)
@@ -99,24 +106,56 @@
 
 .objs\xndloops.obj:\
 Makefile xndloops.c gumath.h
 	$(CC) "-I$(LIBNDTYPESINCLUDE)" "-I$(LIBXNDINCLUDE)" $(CFLAGS_SHARED) -c xndloops.c
 
-unary.obj:\
-Makefile kernels\unary.c gumath.h
-	$(CC) -I. "-I$(LIBNDTYPESINCLUDE)" "-I$(LIBXNDINCLUDE)" $(CFLAGS) -c kernels\unary.c
+cpu_host_unary.obj:\
+Makefile kernels\cpu_host_unary.c kernels\common.h gumath.h
+	$(CC) -I. "-I$(LIBNDTYPESINCLUDE)" "-I$(LIBXNDINCLUDE)" $(CFLAGS) -c kernels\cpu_host_unary.c
 
-.objs\unary.obj:\
-Makefile kernels\unary.c gumath.h
-	$(CC) -I. "-I$(LIBNDTYPESINCLUDE)" "-I$(LIBXNDINCLUDE)" $(CFLAGS_SHARED) -c kernels\unary.c
+.objs\cpu_host_unary.obj:\
+Makefile kernels\cpu_host_unary.c kernels\common.h gumath.h
+	$(CC) -I. "-I$(LIBNDTYPESINCLUDE)" "-I$(LIBXNDINCLUDE)" $(CFLAGS_SHARED) -c kernels\cpu_host_unary.c
 
-binary.obj:\
-Makefile kernels\binary.c gumath.h
-	$(CC) -I. "-I$(LIBNDTYPESINCLUDE)" "-I$(LIBXNDINCLUDE)" $(CFLAGS) -c kernels\binary.c
+cpu_device_unary.obj:\
+Makefile kernels\cpu_device_unary.cc kernels\common.h gumath.h
+	$(CC) -I. "-I$(LIBNDTYPESINCLUDE)" "-I$(LIBXNDINCLUDE)" $(CFLAGS) -c kernels\cpu_device_unary.cc
 
-.objs\binary.obj:\
-Makefile kernels\binary.c gumath.h
-	$(CC) -I. "-I$(LIBNDTYPESINCLUDE)" "-I$(LIBXNDINCLUDE)" $(CFLAGS_SHARED) -c kernels\binary.c
+.objs\cpu_device_unary.obj:\
+Makefile kernels\cpu_device_unary.cc kernels\common.h gumath.h
+	$(CC) -I. "-I$(LIBNDTYPESINCLUDE)" "-I$(LIBXNDINCLUDE)" $(CFLAGS_SHARED) -c kernels\cpu_device_unary.cc
+
+cpu_host_binary.obj:\
+Makefile kernels\cpu_host_binary.c kernels\common.h gumath.h
+	$(CC) -I. "-I$(LIBNDTYPESINCLUDE)" "-I$(LIBXNDINCLUDE)" $(CFLAGS) -c kernels\cpu_host_binary.c
+
+.objs\cpu_host_binary.obj:\
+Makefile kernels\cpu_host_binary.c kernels\common.h gumath.h
+	$(CC) -I. "-I$(LIBNDTYPESINCLUDE)" "-I$(LIBXNDINCLUDE)" $(CFLAGS_SHARED) -c kernels\cpu_host_binary.c
+
+cpu_device_binary.obj:\
+Makefile kernels\cpu_device_binary.cc kernels\common.h gumath.h
+	$(CC) -I. "-I$(LIBNDTYPESINCLUDE)" "-I$(LIBXNDINCLUDE)" $(CFLAGS) -c kernels\cpu_device_binary.cc
+
+.objs\cpu_device_binary.obj:\
+Makefile kernels\cpu_device_binary.cc kernels\common.h gumath.h
+	$(CC) -I. "-I$(LIBNDTYPESINCLUDE)" "-I$(LIBXNDINCLUDE)" $(CFLAGS_SHARED) -c kernels\cpu_device_binary.cc
+
+cpu_device_msvc.obj:\
+Makefile kernels\cpu_device_msvc.cc kernels\common.h gumath.h
+	$(CC) -I. "-I$(LIBNDTYPESINCLUDE)" "-I$(LIBXNDINCLUDE)" $(CFLAGS_NOFP) -c kernels\cpu_device_msvc.cc
+
+.objs\cpu_device_msvc.obj:\
+Makefile kernels\cpu_device_msvc.cc kernels\common.h gumath.h
+	$(CC) -I. "-I$(LIBNDTYPESINCLUDE)" "-I$(LIBXNDINCLUDE)" $(CFLAGS_SHARED_NOFP) -c kernels\cpu_device_msvc.cc
+
+common.obj:\
+Makefile kernels\common.c kernels\common.h gumath.h
+	$(CC) -I. "-I$(LIBNDTYPESINCLUDE)" "-I$(LIBXNDINCLUDE)" $(CFLAGS) -c kernels\common.c
+
+.objs\common.obj:\
+Makefile kernels\common.c kernels\common.h gumath.h
+	$(CC) -I. "-I$(LIBNDTYPESINCLUDE)" "-I$(LIBXNDINCLUDE)" $(CFLAGS_SHARED) -c kernels\common.c
 
 examples.obj:\
 Makefile extending\examples.c gumath.h
 	$(CC) -I. "-I$(LIBNDTYPESINCLUDE)" "-I$(LIBXNDINCLUDE)" $(CFLAGS) -c extending\examples.c
 