Merge branch 'master' of https://github.com/Laeeth/d_excelsdk

Author: Laeeth

XLCALL32.LIB

@@ -70,7 +70,8 @@
 */
 debug=0;
 
-import std.c.windows.windows;
+import core.sys.windows.windows;
+//import std.c.windows.windows;
 import xlcall;
 import xlcallcpp;
 import core.stdc.string;

framework.d

@@ -74,7 +74,7 @@
 
 */
 import win32.winuser:PostMessage,CallWindowProc,GetWindowLongPtr,SetWindowLongPtr,DialogBox;
-import std.c.windows.windows;
+//import std.c.windows.windows;
 import core.sys.windows.windows;
 import xlcall;
 import framework;

generic.d

@@ -1,2 +1,2 @@
-C:\D\dmd2\windows\bin\dmd -c -g -m32 -ofgeneric.obj generic.d  memorymanager.d memorypool.d xlcall.d xlcallcpp.d framework.d
-C:\d\dmd2\windows\bin\dmd -m32 -ofgeneric32.dll -L/IMPLIB generic.obj generic32.def xlcall32d.lib -g -map 
+dmd -c -g -m32 -ofgeneric32.obj generic.d  memorymanager.d memorypool.d xlcall.d xlcallcpp.d framework.d
+dmd -m32 -ofgeneric32.xll -L/IMPLIB generic32.obj generic32.def xlcall32d.lib -g -map 

make32.bat

@@ -1,2 +1,3 @@
-C:\D\dmd2\windows\bin\dmd -c -g -m64 -ofgeneric.obj generic.d  memorymanager.d memorypool.d xlcall.d xlcallcpp.d framework.d
-C:\d\dmd2\windows\bin\dmd -m64 -ofgeneric64.dll generic.obj generic64.def xlcall64d.lib -g -map 
+rm generic64.xll
+dmd -c -gc -m64 -map -ofgeneric64.obj generic.d  memorymanager.d memorypool.d xlcall.d xlcallcpp.d framework.d
+dmd -m64 -g -L/OUT:generic64.xll  -L/NOLOGO -L generic64.obj generic64.def xlcall64d.lib

make64.bat

@@ -27,8 +27,8 @@
 //
 // Total number of memory allocation pools to manage
 //
-
-import std.c.windows.windows;
+import core.sys.windows.windows;
+//import std.c.windows.windows;
 import xlcall;
 import xlcallcpp;
 import memorypool;

memorymanager.d

@@ -20,7 +20,8 @@ MemoryPool.d - port of MemoryPool.cpp and MemoryPool.h by Laeeth Isharc
 //
 ///***************************************************************************
 */
-import std.c.windows.windows;
+import core.sys.windows.windows;
+//import std.c.windows.windows;
 
 //
 // Total amount of memory to allocate for all temporary XLOPERs

memorypool.d

@@ -15,8 +15,8 @@
   
   	Ported to the D Programming Language by Laeeth Isharc (2015)
 */
-import std.c.windows.windows;
-
+//import std.c.windows.windows;
+import core.sys.windows.windows;
 /**
    XL 12 Basic Datatypes 
  */

xlcall.d

@@ -12,8 +12,8 @@
 */
 
 // import windows.h
-import std.c.windows.windows;
-//import core.sys.windows.windows;
+//import std.c.windows.windows;
+import core.sys.windows.windows;
 import xlcall;
 import core.vararg;