From 26fdcc5e41254131ef755b14243c19d202b14d8e Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Tue, 2 Feb 1999 13:57:28 +0000 Subject: [PATCH] Uses preprocessor define WIN32 instead of WINDOWS to build code for Microsoft WIN32. --- client/client.dsp | 4 ++-- comstack/tcpip.c | 34 +++++++++++++++++++--------------- include/statserv.h | 12 ++++++++---- include/yconfig.h | 8 ++++---- server/eventl.c | 10 +++++++--- server/server.dsp | 4 ++-- server/service.c | 8 ++++++-- server/seshigh.c | 10 +++++++--- server/statserv.c | 38 +++++++++++++++++++++----------------- util/nmem.c | 20 ++++++++++++++------ yaz.dsp | 12 +++++------- ztest/ztest.dsp | 12 +++++------- 12 files changed, 100 insertions(+), 72 deletions(-) diff --git a/client/client.dsp b/client/client.dsp index 36dafbb..2a98180 100644 --- a/client/client.dsp +++ b/client/client.dsp @@ -41,7 +41,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "." # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D WINDOWS=1 /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /FD /c # SUBTRACT CPP /YX # ADD BASE RSC /l 0x406 /d "NDEBUG" # ADD RSC /l 0x406 /d "NDEBUG" @@ -74,7 +74,7 @@ PostBuild_Cmds=copy $(OutDir)\$(TargetName).exe $(ProjDir)\..\..\bin # PROP Ignore_Export_Lib 0 # PROP Target_Dir "." # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D WINDOWS=1 /FR /FD /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FR /FD /c # SUBTRACT CPP /YX /Yc /Yu # ADD BASE RSC /l 0x406 /d "_DEBUG" # ADD RSC /l 0x406 /d "_DEBUG" diff --git a/comstack/tcpip.c b/comstack/tcpip.c index 29960cd..f3efddb 100644 --- a/comstack/tcpip.c +++ b/comstack/tcpip.c @@ -4,7 +4,11 @@ * Sebastian Hammer, Adam Dickmeiss * * $Log: tcpip.c,v $ - * Revision 1.26 1999-01-08 11:23:14 adam + * Revision 1.27 1999-02-02 13:57:31 adam + * Uses preprocessor define WIN32 instead of WINDOWS to build code + * for Microsoft WIN32. + * + * Revision 1.26 1999/01/08 11:23:14 adam * Added const modifier to some of the BER/ODR encoding routines. * * Revision 1.25 1998/07/07 15:49:23 adam @@ -153,7 +157,7 @@ #include #include #include -#ifndef WINDOWS +#ifndef WIN32 #include #endif #include @@ -200,7 +204,7 @@ typedef struct tcpip_state char buf[128]; /* returned by cs_addrstr */ } tcpip_state; -#ifdef WINDOWS +#ifdef WIN32 static int tcpip_init (void) { static int initialized = 0; @@ -231,7 +235,7 @@ COMSTACK tcpip_type(int s, int blocking, int protocol) COMSTACK p; tcpip_state *state; int new_socket; -#ifdef WINDOWS +#ifdef WIN32 unsigned long tru = 1; #else struct protoent *proto; @@ -241,7 +245,7 @@ COMSTACK tcpip_type(int s, int blocking, int protocol) return 0; if (s < 0) { -#ifndef WINDOWS +#ifndef WIN32 if (!(proto = getprotobyname("tcp"))) return 0; if ((s = socket(AF_INET, SOCK_STREAM, proto->p_proto)) < 0) @@ -259,7 +263,7 @@ COMSTACK tcpip_type(int s, int blocking, int protocol) xmalloc(sizeof(tcpip_state))))) return 0; -#ifdef WINDOWS +#ifdef WIN32 if (!(p->blocking = blocking) && ioctlsocket(s, FIONBIO, &tru) < 0) #else if (!(p->blocking = blocking) && fcntl(s, F_SETFL, O_NONBLOCK) < 0) @@ -369,7 +373,7 @@ int tcpip_connect(COMSTACK h, void *address) TRC(fprintf(stderr, "tcpip_connect\n")); if (connect(h->iofile, (struct sockaddr *) add, sizeof(*add)) < 0) { -#ifdef WINDOWS +#ifdef WIN32 if (WSAGetLastError() == WSAEWOULDBLOCK) #else if (errno == EINPROGRESS) @@ -393,7 +397,7 @@ int tcpip_rcvconnect(COMSTACK h) int tcpip_bind(COMSTACK h, void *address, int mode) { struct sockaddr *addr = (struct sockaddr *)address; -#ifdef WINDOWS +#ifdef WIN32 BOOL one = 1; #else unsigned long one = 1; @@ -448,7 +452,7 @@ int tcpip_listen(COMSTACK h, char *raddr, int *addrlen, } if ((h->newfd = accept(h->iofile, (struct sockaddr*)&addr, &len)) < 0) { -#ifdef WINDOWS +#ifdef WIN32 if (WSAGetLastError() == WSAEWOULDBLOCK) #else if (errno == EWOULDBLOCK) @@ -467,7 +471,7 @@ int tcpip_listen(COMSTACK h, char *raddr, int *addrlen, sizeof(addr.sin_addr), AF_INET)) { h->cerrno = CSDENY; -#ifdef WINDOWS +#ifdef WIN32 closesocket(h->iofile); #else close(h->iofile); @@ -482,7 +486,7 @@ COMSTACK tcpip_accept(COMSTACK h) { COMSTACK cnew; tcpip_state *state, *st = (tcpip_state *)h->cprivate; -#ifdef WINDOWS +#ifdef WIN32 unsigned long tru = 1; #endif @@ -504,7 +508,7 @@ COMSTACK tcpip_accept(COMSTACK h) h->cerrno = CSYSERR; return 0; } -#ifdef WINDOWS +#ifdef WIN32 if (!cnew->blocking && ioctlsocket(cnew->iofile, FIONBIO, &tru) < 0) #else if (!cnew->blocking && fcntl(cnew->iofile, F_SETFL, O_NONBLOCK) < 0) @@ -558,7 +562,7 @@ int tcpip_get(COMSTACK h, char **buf, int *bufsize) return -1; if ((res = recv(h->iofile, *buf + hasread, CS_TCPIP_BUFCHUNK, 0)) < 0) { -#ifdef WINDOWS +#ifdef WIN32 if (WSAGetLastError() == WSAEWOULDBLOCK) #else #ifdef EINPROGRESS @@ -627,7 +631,7 @@ int tcpip_put(COMSTACK h, char *buf, int size) if ((res = send(h->iofile, buf + state->written, size - state->written, 0)) < 0) { -#ifdef WINDOWS +#ifdef WIN32 if (WSAGetLastError() == WSAEWOULDBLOCK) #else if (errno == EAGAIN) @@ -654,7 +658,7 @@ int tcpip_close(COMSTACK h) TRC(fprintf(stderr, "tcpip_close\n")); if (h->iofile != -1) -#ifdef WINDOWS +#ifdef WIN32 closesocket(h->iofile); #else close(h->iofile); diff --git a/include/statserv.h b/include/statserv.h index 705fc3a..e4669f3 100644 --- a/include/statserv.h +++ b/include/statserv.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 1995-1998, Index Data. + * Copyright (c) 1995-1999, Index Data. * * Permission to use, copy, modify, distribute, and sell this software and * its documentation, in whole or in part, for any purpose, is hereby granted, @@ -24,7 +24,11 @@ * OF THIS SOFTWARE. * * $Log: statserv.h,v $ - * Revision 1.13 1998-02-10 10:28:56 adam + * Revision 1.14 1999-02-02 13:57:32 adam + * Uses preprocessor define WIN32 instead of WINDOWS to build code + * for Microsoft WIN32. + * + * Revision 1.13 1998/02/10 10:28:56 adam * Added app_name, service_dependencies, service_display_name and * options_func. options_func allows us to specify a different function * to interogate the command line arguments. The other members allow us @@ -99,14 +103,14 @@ typedef struct statserv_options_block int (*options_func)(int argc, char **argv); int inetd; /* Do we use the inet deamon or not */ -#ifdef WINDOWS +#ifdef WIN32 /* We only have these members for the windows version */ /* They seemed a bit large to have them there in general */ char service_name[128]; /* NT Service Name */ char app_name[128]; /* Application Name */ char service_dependencies[128]; /* The services we are dependent on */ char service_display_name[128]; /* The service display name */ -#endif /* WINDOWS */ +#endif /* WIN32 */ } statserv_options_block; int statserv_main(int argc, char **argv); diff --git a/include/yconfig.h b/include/yconfig.h index c41e72e..8546f31 100644 --- a/include/yconfig.h +++ b/include/yconfig.h @@ -5,13 +5,13 @@ #ifndef _VMS_ -#ifdef WINDOWS +#ifdef WIN32 #ifdef YNETINCLUDE #include #endif -#else /* #ifdef WINDOWS */ +#else /* #ifdef WIN32 */ #include #include #include @@ -35,14 +35,14 @@ #endif /* ifndef _VMS_ */ #ifndef YAZ_EXPORT -#ifdef WINDOWS +#ifdef WIN32 #define YAZ_EXPORT __declspec(dllexport) #else #define YAZ_EXPORT #endif #endif -#ifdef WINDOWS +#ifdef WIN32 #define MDF #else #ifndef MDF diff --git a/server/eventl.c b/server/eventl.c index f626799..c4b8b3e 100644 --- a/server/eventl.c +++ b/server/eventl.c @@ -1,10 +1,14 @@ /* - * Copyright (c) 1995-1998, Index Data + * Copyright (c) 1995-1999, Index Data * See the file LICENSE for details. * Sebastian Hammer, Adam Dickmeiss * * $Log: eventl.c,v $ - * Revision 1.26 1998-02-11 11:53:35 adam + * Revision 1.27 1999-02-02 13:57:34 adam + * Uses preprocessor define WIN32 instead of WINDOWS to build code + * for Microsoft WIN32. + * + * Revision 1.26 1998/02/11 11:53:35 adam * Changed code so that it compiles as C++. * * Revision 1.25 1998/01/29 13:30:23 adam @@ -90,7 +94,7 @@ #include #include #include -#ifdef WINDOWS +#ifdef WIN32 #include #else #include diff --git a/server/server.dsp b/server/server.dsp index 832dc3e..9784e20 100644 --- a/server/server.dsp +++ b/server/server.dsp @@ -39,7 +39,7 @@ CPP=cl.exe # PROP Intermediate_Dir "Release" # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "WINDOWS" /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c # SUBTRACT CPP /YX BSC32=bscmake.exe # ADD BASE BSC32 /nologo @@ -61,7 +61,7 @@ LIB32=link.exe -lib # PROP Intermediate_Dir "Debug" # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "..\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "WINDOWS" /FR /FD /c +# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "..\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FR /FD /c # SUBTRACT CPP /YX BSC32=bscmake.exe # ADD BASE BSC32 /nologo diff --git a/server/service.c b/server/service.c index 5780284..29e1c7d 100644 --- a/server/service.c +++ b/server/service.c @@ -3,7 +3,11 @@ * Based on code written by * Chas Woodfield, Fretwell Downing Datasystems. * $Log: service.c,v $ - * Revision 1.1 1997-11-07 13:31:52 adam + * Revision 1.2 1999-02-02 13:57:36 adam + * Uses preprocessor define WIN32 instead of WINDOWS to build code + * for Microsoft WIN32. + * + * Revision 1.1 1997/11/07 13:31:52 adam * Added NT Service name part of statserv_options_block. Moved NT * service utility to server library. * @@ -29,7 +33,7 @@ /* For some strange reason it won't work when part of a lib */ /************************************************************/ -#ifdef WINDOWS +#ifdef WIN32 #include #include diff --git a/server/seshigh.c b/server/seshigh.c index 113b258..8a65140 100644 --- a/server/seshigh.c +++ b/server/seshigh.c @@ -1,10 +1,14 @@ /* - * Copyright (c) 1995-1998, Index Data + * Copyright (c) 1995-1999, Index Data * See the file LICENSE for details. * Sebastian Hammer, Adam Dickmeiss * * $Log: seshigh.c,v $ - * Revision 1.85 1998-11-17 09:52:59 adam + * Revision 1.86 1999-02-02 13:57:38 adam + * Uses preprocessor define WIN32 instead of WINDOWS to build code + * for Microsoft WIN32. + * + * Revision 1.85 1998/11/17 09:52:59 adam * Fixed minor bug (introduced by previous commit). * * Revision 1.84 1998/11/16 16:02:32 adam @@ -298,7 +302,7 @@ #include #include #include -#ifdef WINDOWS +#ifdef WIN32 #include #else #include diff --git a/server/statserv.c b/server/statserv.c index 9146973..b7759f3 100644 --- a/server/statserv.c +++ b/server/statserv.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1995-1998, Index Data + * Copyright (c) 1995-1999, Index Data * See the file LICENSE for details. * Sebastian Hammer, Adam Dickmeiss * @@ -7,7 +7,11 @@ * Chas Woodfield, Fretwell Downing Datasystems. * * $Log: statserv.c,v $ - * Revision 1.52 1998-08-21 14:13:34 adam + * Revision 1.53 1999-02-02 13:57:39 adam + * Uses preprocessor define WIN32 instead of WINDOWS to build code + * for Microsoft WIN32. + * + * Revision 1.52 1998/08/21 14:13:34 adam * Added GNU Configure script to build Makefiles. * * Revision 1.51 1998/07/07 15:51:03 adam @@ -186,7 +190,7 @@ #include #include #include -#ifdef WINDOWS +#ifdef WIN32 #include #include #include @@ -232,12 +236,12 @@ statserv_options_block control_block = { check_options, /* Default routine, for checking the run-time arguments */ 0 /* default value for inet deamon */ -#ifdef WINDOWS +#ifdef WIN32 ,"Z39.50 Server", /* NT Service Name */ "Server", /* NT application Name */ "", /* NT Service Dependencies */ "Z39.50 Server" /* NT Service Display Name */ -#endif /* WINDOWS */ +#endif /* WIN32 */ }; /* @@ -246,7 +250,7 @@ statserv_options_block control_block = { * doing all of the listening and accepting in the parent - it's * safer that way. */ -#ifdef WINDOWS +#ifdef WIN32 typedef struct _ThreadList ThreadList; @@ -457,7 +461,7 @@ static void listener(IOCHAN h, int event) logf(LOG_DEBUG, "Setting timeout %d", control_block.idle_timeout); iochan_setdata(new_chan, newas); iochan_settimeout(new_chan, control_block.idle_timeout * 60); -#ifndef WINDOWS +#ifndef WIN32 logf(LOG_DEBUG, "Determining client address"); a = cs_addrstr(new_line); logf(LOG_LOG, "Accepted connection from %s", a ? a : "[Unknown]"); @@ -491,7 +495,7 @@ static void listener(IOCHAN h, int event) } } -#else /* WINDOWS */ +#else /* WIN32 */ /* To save having an #ifdef in event_loop we need to define this empty function */ void statserv_remove(IOCHAN pIOChannel) @@ -655,7 +659,7 @@ static void listener(IOCHAN h, int event) } } -#endif /* WINDOWS */ +#endif /* WIN32 */ static void inetd_connection(int what) { @@ -760,7 +764,7 @@ static void add_listener(char *where, int what) pListener = lst; } -#ifndef WINDOWS +#ifndef WIN32 /* For windows we don't need to catch the signals */ static void catchchld(int num) { @@ -768,7 +772,7 @@ static void catchchld(int num) ; signal(SIGCHLD, catchchld); } -#endif /* WINDOWS */ +#endif /* WIN32 */ statserv_options_block *statserv_getcontrol(void) { @@ -788,12 +792,12 @@ int statserv_start(int argc, char **argv) int ret; nmem_init (); -#ifdef WINDOWS +#ifdef WIN32 /* We need to initialize the thread list */ ThreadList_Initialize(); -#endif /* WINDOWS */ +#endif /* WIN32 */ -#ifdef WINDOWS +#ifdef WIN32 if ((me = strrchr (argv[0], '\\'))) me++; else @@ -804,7 +808,7 @@ int statserv_start(int argc, char **argv) if (control_block.options_func(argc, argv)) return(1); -#ifndef WINDOWS +#ifndef WIN32 if (control_block.inetd) inetd_connection(control_block.default_proto); else @@ -829,7 +833,7 @@ int statserv_start(int argc, char **argv) exit(1); } } -#endif /* WINDOWS */ +#endif /* WIN32 */ if ((pListener == NULL) && *control_block.default_listen) add_listener(control_block.default_listen, @@ -921,7 +925,7 @@ int check_options(int argc, char **argv) return 0; } -#ifdef WINDOWS +#ifdef WIN32 typedef struct _Args { char **argv; diff --git a/util/nmem.c b/util/nmem.c index 5f55cee..b861b11 100644 --- a/util/nmem.c +++ b/util/nmem.c @@ -1,10 +1,14 @@ /* - * Copyright (c) 1995-1998, Index Data. + * Copyright (c) 1995-1999, Index Data. * See the file LICENSE for details. * Sebastian Hammer, Adam Dickmeiss * * $Log: nmem.c,v $ - * Revision 1.13 1998-10-19 15:24:21 adam + * Revision 1.14 1999-02-02 13:57:40 adam + * Uses preprocessor define WIN32 instead of WINDOWS to build code + * for Microsoft WIN32. + * + * Revision 1.13 1998/10/19 15:24:21 adam * New nmem utility, nmem_transfer, that transfer blocks from one * NMEM to another. * @@ -56,10 +60,11 @@ * allocation. Evemtually we'll put in something better. */ +#include #include #include #include -#ifdef WINDOWS +#ifdef WIN32 #include #elif _REENTRANT @@ -73,7 +78,7 @@ #define NMEM_CHUNK (4*1024) -#ifdef WINDOWS +#ifdef WIN32 static CRITICAL_SECTION critical_section; #define NMEM_ENTER EnterCriticalSection(&critical_section) #define NMEM_LEAVE LeaveCriticalSection(&critical_section) @@ -89,6 +94,7 @@ static pthread_mutex_t nmem_mutex = PTHREAD_MUTEX_INITIALIZER; static nmem_block *freelist = NULL; /* "global" freelists */ static nmem_control *cfreelist = NULL; static int nmem_active_no = 0; +static int nmem_init_flag = 0; static void free_block(nmem_block *p) { @@ -173,6 +179,7 @@ void *nmem_malloc(NMEM n, int size) #endif if (!n) return xmalloc(size); + assert (nmem_init_flag); NMEM_ENTER; p = n->blocks; if (!p || p->size - p->top < size) @@ -266,7 +273,8 @@ void nmem_critical_leave (void) void nmem_init (void) { -#ifdef WINDOWS + nmem_init_flag = 1; +#ifdef WIN32 InitializeCriticalSection(&critical_section); #endif nmem_active_no = 0; @@ -289,7 +297,7 @@ void nmem_exit (void) cfreelist = cfreelist->next; xfree (cfl); } -#ifdef WINDOWS +#ifdef WIN32 DeleteCriticalSection(&critical_section); #endif } diff --git a/yaz.dsp b/yaz.dsp index 07d5092..dac8256 100644 --- a/yaz.dsp +++ b/yaz.dsp @@ -42,7 +42,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D WINDOWS=1 /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /FD /c # SUBTRACT CPP /YX # ADD BASE MTL /nologo /D "NDEBUG" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 @@ -61,8 +61,7 @@ ProjDir=. TargetName=yaz SOURCE=$(InputPath) PostBuild_Desc=Copy Lib and Dll -PostBuild_Cmds=copy $(OutDir)\$(TargetName).lib $(ProjDir)\lib copy\ - $(OutDir)\$(TargetName).dll $(ProjDir)\..\bin +PostBuild_Cmds=copy $(OutDir)\$(TargetName).dll $(ProjDir)\..\bin # End Special Build Tool !ELSEIF "$(CFG)" == "yaz - Win32 Debug" @@ -79,7 +78,7 @@ PostBuild_Cmds=copy $(OutDir)\$(TargetName).lib $(ProjDir)\lib copy\ # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D WINDOWS=1 /FR /FD /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /FR /FD /c # SUBTRACT CPP /YX # ADD BASE MTL /nologo /D "_DEBUG" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 @@ -97,9 +96,8 @@ OutDir=.\.\Debug ProjDir=. TargetName=yaz SOURCE=$(InputPath) -PostBuild_Desc=Copy Lib and Dll -PostBuild_Cmds=copy $(OutDir)\$(TargetName).lib $(ProjDir)\lib copy\ - $(OutDir)\$(TargetName).dll $(ProjDir)\..\bin +PostBuild_Desc=Copy Dll +PostBuild_Cmds=copy $(OutDir)\$(TargetName).dll $(ProjDir)\..\bin # End Special Build Tool !ENDIF diff --git a/ztest/ztest.dsp b/ztest/ztest.dsp index 36e2f58..5153bc6 100644 --- a/ztest/ztest.dsp +++ b/ztest/ztest.dsp @@ -1,5 +1,5 @@ # Microsoft Developer Studio Project File - Name="ztest" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# Microsoft Developer Studio Generated Build File, Format Version 5.00 # ** DO NOT EDIT ** # TARGTYPE "Win32 (x86) Console Application" 0x0103 @@ -22,7 +22,6 @@ CFG=ztest - Win32 Debug !MESSAGE # Begin Project -# PROP AllowPerConfigDependencies 0 # PROP Scc_ProjName "" # PROP Scc_LocalPath "" CPP=cl.exe @@ -42,7 +41,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "WINDOWS" /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c # SUBTRACT CPP /YX # ADD BASE RSC /l 0x406 /d "NDEBUG" # ADD RSC /l 0x406 /d "NDEBUG" @@ -56,7 +55,7 @@ LINK32=link.exe OutDir=.\Release ProjDir=. TargetName=ztest -SOURCE="$(InputPath)" +SOURCE=$(InputPath) PostBuild_Desc=Copy ztest.exe PostBuild_Cmds=copy $(OutDir)\$(TargetName).exe $(ProjDir)\..\..\bin # End Special Build Tool @@ -75,8 +74,7 @@ PostBuild_Cmds=copy $(OutDir)\$(TargetName).exe $(ProjDir)\..\..\bin # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "WINDOWS" /FR /FD /c -# SUBTRACT CPP /YX +# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "..\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /FD /c # ADD BASE RSC /l 0x406 /d "_DEBUG" # ADD RSC /l 0x406 /d "_DEBUG" BSC32=bscmake.exe @@ -89,7 +87,7 @@ LINK32=link.exe OutDir=.\Debug ProjDir=. TargetName=ztest -SOURCE="$(InputPath)" +SOURCE=$(InputPath) PostBuild_Desc=Copy ztest.exe PostBuild_Cmds=copy $(OutDir)\$(TargetName).exe $(ProjDir)\..\..\bin # End Special Build Tool -- 1.7.10.4