diff --git a/ase/ase.dsw b/ase/ase.dsw index ed7e5ce6..c181c130 100644 --- a/ase/ase.dsw +++ b/ase/ase.dsw @@ -15,6 +15,18 @@ Package=<4> ############################################################################### +Project: "xptestawk"=.\xp\test\awk\xptestawk.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + Global: Package=<5> diff --git a/ase/awk/awk.dsp b/ase/awk/awk.dsp index 40a64c0d..f6561554 100644 --- a/ase/awk/awk.dsp +++ b/ase/awk/awk.dsp @@ -54,7 +54,8 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 -# ADD LINK32 /nologo /version:0.1 /dll /machine:I386 +# ADD LINK32 /nologo /version:0.1 /subsystem:console /dll /machine:I386 /def:".\awk.def" +# SUBTRACT LINK32 /pdb:none !ELSEIF "$(CFG)" == "xpawk - Win32 Debug" @@ -81,7 +82,8 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 /nologo /dll /debug /machine:I386 /pdbtype:sept +# ADD LINK32 /nologo /subsystem:console /dll /debug /machine:I386 /def:".\awk.def" /pdbtype:sept +# SUBTRACT LINK32 /pdb:none !ENDIF @@ -99,6 +101,7 @@ SOURCE=.\awk.c # Begin Source File SOURCE=.\awk.def +# PROP Exclude_From_Build 1 # End Source File # Begin Source File diff --git a/ase/test/awk/awk.c b/ase/test/awk/awk.c index 21480e7c..3095edf9 100644 --- a/ase/test/awk/awk.c +++ b/ase/test/awk/awk.c @@ -1,12 +1,16 @@ /* - * $Id: awk.c,v 1.14 2006-03-31 16:35:37 bacon Exp $ + * $Id: awk.c,v 1.15 2006-03-31 18:09:26 bacon Exp $ */ #include -#include #include +#include -#ifdef __STAND_ALONE +#ifdef XP_CHAR_IS_MCHAR +#define xp_printf printf +#else +#define xp_printf wprintf +#endif static xp_ssize_t process_source (int cmd, void* arg, xp_char_t* data, xp_size_t size) { @@ -32,32 +36,6 @@ static xp_ssize_t process_source (int cmd, void* arg, xp_char_t* data, xp_size_t return -1; } -#else - -#include -#include - -static xp_ssize_t process_source (int cmd, void* arg, xp_char_t* data, xp_size_t size) -{ - xp_ssize_t n; - - switch (cmd) { - case XP_AWK_IO_OPEN: - case XP_AWK_IO_CLOSE: - return 0; - - case XP_AWK_IO_DATA: - if (size < 0) return -1; - n = xp_sio_getc (xp_sio_in, data); - if (n == 0) return 0; - if (n != 1) return -1; - return n; - } - - return -1; -} -#endif - #ifdef __linux #include #endif diff --git a/ase/test/awk/xptestawk.dsp b/ase/test/awk/xptestawk.dsp new file mode 100644 index 00000000..06d916a4 --- /dev/null +++ b/ase/test/awk/xptestawk.dsp @@ -0,0 +1,102 @@ +# Microsoft Developer Studio Project File - Name="awk" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Console Application" 0x0103 + +CFG=xptestawk - Win32 Debug +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "xptestawk.mak". +!MESSAGE +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "xptestawk.mak" CFG="xptestawk - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "xptestawk - Win32 Release" (based on "Win32 (x86) Console Application") +!MESSAGE "xptestawk - Win32 Debug" (based on "Win32 (x86) Console Application") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +RSC=rc.exe + +!IF "$(CFG)" == "xptestawk - Win32 Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "Release" +# PROP BASE Intermediate_Dir "Release" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "Release" +# PROP Intermediate_Dir "Release" +# 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 /MT /W3 /GX /O2 /I "..\..\.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c +# ADD BASE RSC /l 0x409 /d "NDEBUG" +# ADD RSC /l 0x409 /d "NDEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 +# ADD LINK32 kernel32.lib xpawk.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\bas" /libpath:"..\..\awk\debug" + +!ELSEIF "$(CFG)" == "xptestawk - Win32 Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "Debug" +# PROP BASE Intermediate_Dir "Debug" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "Debug" +# PROP Intermediate_Dir "Debug" +# 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 /GZ /c +# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\..\.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c +# ADD BASE RSC /l 0x409 /d "_DEBUG" +# ADD RSC /l 0x409 /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept +# ADD LINK32 kernel32.lib xpawk.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\bas" /libpath:"..\..\awk\debug" + +!ENDIF + +# Begin Target + +# Name "xptestawk - Win32 Release" +# Name "xptestawk - Win32 Debug" +# Begin Group "Source Files" + +# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" +# Begin Source File + +SOURCE=.\awk.c +# End Source File +# End Group +# Begin Group "Header Files" + +# PROP Default_Filter "h;hpp;hxx;hm;inl" +# End Group +# Begin Group "Resource Files" + +# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" +# End Group +# End Target +# End Project