diff --git a/ase/ase.dsw b/ase/ase.dsw index 0c1196f4..65279050 100644 --- a/ase/ase.dsw +++ b/ase/ase.dsw @@ -3,7 +3,7 @@ Microsoft Developer Studio Workspace File, Format Version 6.00 ############################################################################### -Project: "awk"=.\awk\awk.dsp - Package Owner=<4> +Project: "ase.com"=.\com\ase.dsp - Package Owner=<4> Package=<5> {{{ @@ -15,7 +15,19 @@ Package=<4> ############################################################################### -Project: "ase.com"=.\com\ase.dsp - Package Owner=<4> +Project: "awk.lib"=.\awk\awk.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + +Project: "awk.jni"=.\awk\jni.dsp - Package Owner=<4> Package=<5> {{{ diff --git a/ase/awk/awk.dsp b/ase/awk/awk.dsp index 53e09d2b..018bc3bd 100644 --- a/ase/awk/awk.dsp +++ b/ase/awk/awk.dsp @@ -4,7 +4,7 @@ # TARGTYPE "Win32 (x86) Static Library" 0x0104 -CFG=awk - Win32 Release +CFG=awk.lib - Win32 Release !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run !MESSAGE @@ -13,12 +13,12 @@ CFG=awk - Win32 Release !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 "awk.mak" CFG="awk - Win32 Release" +!MESSAGE NMAKE /f "awk.mak" CFG="awk.lib - Win32 Release" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE -!MESSAGE "awk - Win32 Release" (based on "Win32 (x86) Static Library") -!MESSAGE "awk - Win32 Debug" (based on "Win32 (x86) Static Library") +!MESSAGE "awk.lib - Win32 Release" (based on "Win32 (x86) Static Library") +!MESSAGE "awk.lib - Win32 Debug" (based on "Win32 (x86) Static Library") !MESSAGE # Begin Project @@ -28,7 +28,7 @@ CFG=awk - Win32 Release CPP=cl.exe RSC=rc.exe -!IF "$(CFG)" == "awk - Win32 Release" +!IF "$(CFG)" == "awk.lib - Win32 Release" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 @@ -56,7 +56,7 @@ LIB32=link.exe -lib # ADD BASE LIB32 /nologo # ADD LIB32 /nologo /out:"../release/win32/vs60/aseawk.lib" -!ELSEIF "$(CFG)" == "awk - Win32 Debug" +!ELSEIF "$(CFG)" == "awk.lib - Win32 Debug" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 @@ -88,8 +88,8 @@ LIB32=link.exe -lib # Begin Target -# Name "awk - Win32 Release" -# Name "awk - Win32 Debug" +# Name "awk.lib - Win32 Release" +# Name "awk.lib - Win32 Debug" # Begin Group "Source Files" # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" diff --git a/ase/awk/jni.c b/ase/awk/jni.c index 6bdd1698..7fcf8ac1 100644 --- a/ase/awk/jni.c +++ b/ase/awk/jni.c @@ -1,16 +1,17 @@ /* - * $Id: jni.c,v 1.37 2006-12-09 17:36:27 bacon Exp $ + * $Id: jni.c,v 1.38 2006-12-12 05:44:41 bacon Exp $ */ -#include -#include +#include +#include #include #include #include #include -#include #include #include +#include +#include #ifdef _WIN32 #include @@ -569,8 +570,9 @@ static ase_ssize_t __java_write_source ( jmethodID mid; jcharArray array; jchar* tmp; - jint ret, i; + jint ret; jthrowable thrown; + ase_size_t i; class = (*env)->GetObjectClass(env, obj); mid = (*env)->GetMethodID (env, class, "writeSource", "([CI)I"); @@ -775,9 +777,9 @@ static ase_ssize_t __java_write_extio ( jclass class; jmethodID mid; jcharArray array; - ase_ssize_t i; jchar* tmp; jint ret; + ase_size_t i; jthrowable thrown; class = (*env)->GetObjectClass(env, obj); diff --git a/ase/awk/jni.dsp b/ase/awk/jni.dsp new file mode 100644 index 00000000..e1d6d786 --- /dev/null +++ b/ase/awk/jni.dsp @@ -0,0 +1,113 @@ +# Microsoft Developer Studio Project File - Name="awk.jni" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 + +CFG=awk.jni - 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 "jni.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 "jni.mak" CFG="awk.jni - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "awk.jni - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "awk.jni - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +MTL=midl.exe +RSC=rc.exe + +!IF "$(CFG)" == "awk.jni - 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/win32/vs60" +# PROP Intermediate_Dir "release/win32/vs60" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "JNI_EXPORTS" /YX /FD /c +# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\.." /I "C:\Program Files\java\jdk1.5.0_09\include" /I "C:\Program Files\java\jdk1.5.0_09\include\win32" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_UNICODE" /D "_USRDLL" /FD /c +# SUBTRACT CPP /YX +# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 +# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 +# 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 /nologo /dll /machine:I386 +# ADD LINK32 aseawk.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 /dll /machine:I386 /out:"../release/win32/vs60/aseawk.dll" /implib:"release/win32/vs60/aseawk.lib" /libpath:"$(OutDir)" + +!ELSEIF "$(CFG)" == "awk.jni - 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/win32/vs60" +# PROP Intermediate_Dir "debug/win32/vs60" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "JNI_EXPORTS" /YX /FD /GZ /c +# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\.." /I "C:\Program Files\java\jdk1.5.0_09\include" /I "C:\Program Files\java\jdk1.5.0_09\include\win32" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_UNICODE" /D "_USRDLL" /FD /GZ /c +# SUBTRACT CPP /YX +# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 +# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 +# 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 /nologo /dll /debug /machine:I386 /pdbtype:sept +# ADD LINK32 aseawk.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 /dll /debug /machine:I386 /out:"../debug/win32/vs60/aseawk.dll" /implib:"debug/win32/vs60/aseawk.lib" /pdbtype:sept /libpath:"$(OutDir)" + +!ENDIF + +# Begin Target + +# Name "awk.jni - Win32 Release" +# Name "awk.jni - Win32 Debug" +# Begin Group "Source Files" + +# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" +# Begin Source File + +SOURCE=.\jni.c +# End Source File +# End Group +# Begin Group "Header Files" + +# PROP Default_Filter "h;hpp;hxx;hm;inl" +# Begin Source File + +SOURCE=.\jni.h +# End Source File +# 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