Add .def file to export the sqlite functions from our win32 dll

diff --git a/ext/sqlite/php_sqlite.def b/ext/sqlite/php_sqlite.def
new file mode 100644 (file)
index 0000000..e61a0cd
--- /dev/null
+++ b/ext/sqlite/php_sqlite.def
@@ -0,0 +1,37 @@
+EXPORTS
+sqlite_open
+sqlite_close
+sqlite_exec
+sqlite_last_insert_rowid
+sqlite_changes
+sqlite_error_string
+sqlite_interrupt
+sqlite_complete
+sqlite_busy_handler
+sqlite_busy_timeout
+sqlite_get_table
+sqlite_free_table
+sqlite_exec_printf
+sqlite_exec_vprintf
+sqlite_get_table_printf
+sqlite_get_table_vprintf
+sqlite_mprintf
+sqlite_vmprintf
+sqlite_freemem
+sqlite_libversion
+sqlite_libencoding
+sqlite_create_function
+sqlite_create_aggregate
+sqlite_function_type
+sqlite_set_result_string
+sqlite_set_result_int
+sqlite_set_result_double
+sqlite_set_result_error
+sqlite_user_data
+sqlite_aggregate_context
+sqlite_aggregate_count
+sqlite_set_authorizer
+sqlite_trace
+sqlite_compile
+sqlite_step
+sqlite_finalize

diff --git a/ext/sqlite/sqlite.dsp b/ext/sqlite/sqlite.dsp
index 8345dde9b424a93732ef5e788adb50a2f478e8bb..f3981cb271d3df0059a2028a9108ca3d3adbcc4c 100644 (file)
--- a/ext/sqlite/sqlite.dsp
+++ b/ext/sqlite/sqlite.dsp
@@ -44,7 +44,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
 # ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SQLITE_EXPORTS" /YX /FD /c\r
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\php4" /I "..\..\..\php4\main" /I "..\..\..\php4\Zend" /I "..\..\..\php4\TSRM" /I "..\..\..\php4\win32" /I "..\..\..\php_build" /I "..\..\..\php_build\include\lcrzo" /D ZEND_DEBUG=0 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "COMPILE_DL_SQLITE" /D ZTS=1 /D "ZEND_WIN32" /D "PHP_WIN32" /D HAVE_SQLITE=1 /D "PHP_SQLITE_EXPORTS" /FR /YX /FD /c\r
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\php4" /I "..\..\..\php4\main" /I "..\..\..\php4\Zend" /I "..\..\..\php4\TSRM" /I "..\..\..\php4\win32" /I "..\..\..\php_build" /D ZEND_DEBUG=0 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "COMPILE_DL_SQLITE" /D ZTS=1 /D "ZEND_WIN32" /D "PHP_WIN32" /D HAVE_SQLITE=1 /D "PHP_SQLITE_EXPORTS" /FR /YX /FD /c\r
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x407 /d "NDEBUG"\r
@@ -54,7 +54,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
 # 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\r
-# ADD LINK32 php4ts.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_TS\php_sqlite.dll" /libpath:"..\..\..\php4\Release_TS" /libpath:"..\..\..\php4\Release_TS_Inline" /libpath:"..\..\..\php_build\release" /libpath:"..\..\..\php_build\lib\lcrzo"\r
+# ADD LINK32 php4ts.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_TS\php_sqlite.dll" /libpath:"..\..\..\php4\Release_TS" /libpath:"..\..\..\php4\Release_TS_Inline" /libpath:"..\..\..\php_build\release"\r
 \r
 !ELSEIF  "$(CFG)" == "sqlite - Win32 Debug_TS"\r
 \r
@@ -70,7 +70,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
 # ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SQLITE_EXPORTS" /YX /FD /GZ /c\r
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\php4" /I "..\..\..\php4\main" /I "..\..\..\php4\Zend" /I "..\..\..\php4\TSRM" /I "..\..\..\php4\win32" /I "..\..\..\php_build" /I "..\..\..\php_build\include\lcrzo" /D ZEND_DEBUG=1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "COMPILE_DL_SQLITE" /D ZTS=1 /D "ZEND_WIN32" /D "PHP_WIN32" /D HAVE_SQLITE=1 /D "PHP_SQLITE_EXPORTS" /YX /FD /GZ /c\r
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\php4" /I "..\..\..\php4\main" /I "..\..\..\php4\Zend" /I "..\..\..\php4\TSRM" /I "..\..\..\php4\win32" /I "..\..\..\php_build" /D ZEND_DEBUG=1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "COMPILE_DL_SQLITE" /D ZTS=1 /D "ZEND_WIN32" /D "PHP_WIN32" /D HAVE_SQLITE=1 /D "PHP_SQLITE_EXPORTS" /YX /FD /GZ /c\r
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32\r
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32\r
 # ADD BASE RSC /l 0x407 /d "_DEBUG"\r
@@ -80,7 +80,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
 # 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\r
-# ADD LINK32 php4ts_debug.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_TS\php_sqlite.dll" /pdbtype:sept /libpath:"..\..\..\php4\Debug_TS" /libpath:"..\..\..\php_build\release" /libpath:"..\..\..\php_build\lib\lcrzo"\r
+# ADD LINK32 php4ts_debug.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_TS\php_sqlite.dll" /pdbtype:sept /libpath:"..\..\..\php4\Debug_TS" /libpath:"..\..\..\php_build\release"\r
 \r
 !ENDIF \r
 \r
@@ -101,12 +101,10 @@ SOURCE=.\libsqlite\src\attach.c
 # Begin Source File\r
 \r
 SOURCE=.\libsqlite\src\auth.c\r
-# SUBTRACT CPP /D HAVE_SQLITE=1 /D "PHP_SQLITE_EXPORTS"\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=.\libsqlite\src\btree.c\r
-# SUBTRACT CPP /D HAVE_SQLITE=1 /D "PHP_SQLITE_EXPORTS"\r
 # End Source File\r
 # Begin Source File\r
 \r
@@ -119,7 +117,6 @@ SOURCE=.\libsqlite\src\btree_rb.c
 # Begin Source File\r
 \r
 SOURCE=.\libsqlite\src\build.c\r
-# SUBTRACT CPP /D HAVE_SQLITE=1 /D "PHP_SQLITE_EXPORTS"\r
 # End Source File\r
 # Begin Source File\r
 \r
@@ -132,27 +129,22 @@ SOURCE=.\libsqlite\src\copy.c
 # Begin Source File\r
 \r
 SOURCE=.\libsqlite\src\delete.c\r
-# SUBTRACT CPP /D HAVE_SQLITE=1 /D "PHP_SQLITE_EXPORTS"\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=.\libsqlite\src\encode.c\r
-# SUBTRACT CPP /D HAVE_SQLITE=1 /D "PHP_SQLITE_EXPORTS"\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=.\libsqlite\src\expr.c\r
-# SUBTRACT CPP /D HAVE_SQLITE=1 /D "PHP_SQLITE_EXPORTS"\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=.\libsqlite\src\func.c\r
-# SUBTRACT CPP /D HAVE_SQLITE=1 /D "PHP_SQLITE_EXPORTS"\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=.\libsqlite\src\hash.c\r
-# SUBTRACT CPP /D HAVE_SQLITE=1 /D "PHP_SQLITE_EXPORTS"\r
 # End Source File\r
 # Begin Source File\r
 \r
@@ -161,17 +153,14 @@ SOURCE=.\libsqlite\src\hash.h
 # Begin Source File\r
 \r
 SOURCE=.\libsqlite\src\insert.c\r
-# SUBTRACT CPP /D HAVE_SQLITE=1 /D "PHP_SQLITE_EXPORTS"\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=.\libsqlite\src\main.c\r
-# SUBTRACT CPP /D HAVE_SQLITE=1 /D "PHP_SQLITE_EXPORTS"\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=.\libsqlite\src\opcodes.c\r
-# SUBTRACT CPP /D HAVE_SQLITE=1 /D "PHP_SQLITE_EXPORTS"\r
 # End Source File\r
 # Begin Source File\r
 \r
@@ -180,7 +169,6 @@ SOURCE=.\libsqlite\src\opcodes.h
 # Begin Source File\r
 \r
 SOURCE=.\libsqlite\src\os.c\r
-# SUBTRACT CPP /D HAVE_SQLITE=1 /D "PHP_SQLITE_EXPORTS"\r
 # End Source File\r
 # Begin Source File\r
 \r
@@ -189,7 +177,6 @@ SOURCE=.\libsqlite\src\os.h
 # Begin Source File\r
 \r
 SOURCE=.\libsqlite\src\pager.c\r
-# SUBTRACT CPP /D HAVE_SQLITE=1 /D "PHP_SQLITE_EXPORTS"\r
 # End Source File\r
 # Begin Source File\r
 \r
@@ -198,7 +185,6 @@ SOURCE=.\libsqlite\src\pager.h
 # Begin Source File\r
 \r
 SOURCE=.\libsqlite\src\parse.c\r
-# SUBTRACT CPP /D HAVE_SQLITE=1 /D "PHP_SQLITE_EXPORTS"\r
 # End Source File\r
 # Begin Source File\r
 \r
@@ -211,17 +197,14 @@ SOURCE=.\libsqlite\src\pragma.c
 # Begin Source File\r
 \r
 SOURCE=.\libsqlite\src\printf.c\r
-# SUBTRACT CPP /D HAVE_SQLITE=1 /D "PHP_SQLITE_EXPORTS"\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=.\libsqlite\src\random.c\r
-# SUBTRACT CPP /D HAVE_SQLITE=1 /D "PHP_SQLITE_EXPORTS"\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=.\libsqlite\src\select.c\r
-# SUBTRACT CPP /D HAVE_SQLITE=1 /D "PHP_SQLITE_EXPORTS"\r
 # End Source File\r
 # Begin Source File\r
 \r
@@ -292,27 +275,22 @@ SOURCE=.\libsqlite\src\sqliteInt.h
 # Begin Source File\r
 \r
 SOURCE=.\libsqlite\src\table.c\r
-# SUBTRACT CPP /D HAVE_SQLITE=1 /D "PHP_SQLITE_EXPORTS"\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=.\libsqlite\src\tokenize.c\r
-# SUBTRACT CPP /D HAVE_SQLITE=1 /D "PHP_SQLITE_EXPORTS"\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=.\libsqlite\src\trigger.c\r
-# SUBTRACT CPP /D HAVE_SQLITE=1 /D "PHP_SQLITE_EXPORTS"\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=.\libsqlite\src\update.c\r
-# SUBTRACT CPP /D HAVE_SQLITE=1 /D "PHP_SQLITE_EXPORTS"\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=.\libsqlite\src\util.c\r
-# SUBTRACT CPP /D HAVE_SQLITE=1 /D "PHP_SQLITE_EXPORTS"\r
 # End Source File\r
 # Begin Source File\r
 \r
@@ -321,7 +299,6 @@ SOURCE=.\libsqlite\src\vacuum.c
 # Begin Source File\r
 \r
 SOURCE=.\libsqlite\src\vdbe.c\r
-# SUBTRACT CPP /D HAVE_SQLITE=1 /D "PHP_SQLITE_EXPORTS"\r
 # End Source File\r
 # Begin Source File\r
 \r
@@ -330,14 +307,16 @@ SOURCE=.\libsqlite\src\vdbe.h
 # Begin Source File\r
 \r
 SOURCE=.\libsqlite\src\where.c\r
-# SUBTRACT CPP /D HAVE_SQLITE=1 /D "PHP_SQLITE_EXPORTS"\r
 # End Source File\r
 # End Group\r
 # Begin Source File\r
 \r
+SOURCE=.\php_sqlite.def\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=.\sqlite.c\r
 # ADD CPP /I "libsqlite\src"\r
-# SUBTRACT CPP /I "..\..\..\php_build\include\lcrzo"\r
 # End Source File\r
 # End Group\r
 # Begin Group "Header Files"\r