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

1 files changed, 8 insertions, 29 deletions

diff --git a/ext/sqlite/sqlite.dsp b/ext/sqlite/sqlite.dsp
index 8345dde9b4..f3981cb271 100644
--- a/ext/sqlite/sqlite.dsp
+++ b/ext/sqlite/sqlite.dsp
@@ -44,7 +44,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SQLITE_EXPORTS" /YX /FD /c

-# 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

+# 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

 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32

 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32

 # ADD BASE RSC /l 0x407 /d "NDEBUG"

@@ -54,7 +54,7 @@ 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 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"

+# 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"

 

 !ELSEIF  "$(CFG)" == "sqlite - Win32 Debug_TS"

 

@@ -70,7 +70,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # 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

-# 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

+# 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

 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32

 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32

 # ADD BASE RSC /l 0x407 /d "_DEBUG"

@@ -80,7 +80,7 @@ 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 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"

+# 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"

 

 !ENDIF 

 

@@ -101,12 +101,10 @@ SOURCE=.\libsqlite\src\attach.c
 # Begin Source File

 

 SOURCE=.\libsqlite\src\auth.c

-# SUBTRACT CPP /D HAVE_SQLITE=1 /D "PHP_SQLITE_EXPORTS"

 # End Source File

 # Begin Source File

 

 SOURCE=.\libsqlite\src\btree.c

-# SUBTRACT CPP /D HAVE_SQLITE=1 /D "PHP_SQLITE_EXPORTS"

 # End Source File

 # Begin Source File

 

@@ -119,7 +117,6 @@ SOURCE=.\libsqlite\src\btree_rb.c
 # Begin Source File

 

 SOURCE=.\libsqlite\src\build.c

-# SUBTRACT CPP /D HAVE_SQLITE=1 /D "PHP_SQLITE_EXPORTS"

 # End Source File

 # Begin Source File

 

@@ -132,27 +129,22 @@ SOURCE=.\libsqlite\src\copy.c
 # Begin Source File

 

 SOURCE=.\libsqlite\src\delete.c

-# SUBTRACT CPP /D HAVE_SQLITE=1 /D "PHP_SQLITE_EXPORTS"

 # End Source File

 # Begin Source File

 

 SOURCE=.\libsqlite\src\encode.c

-# SUBTRACT CPP /D HAVE_SQLITE=1 /D "PHP_SQLITE_EXPORTS"

 # End Source File

 # Begin Source File

 

 SOURCE=.\libsqlite\src\expr.c

-# SUBTRACT CPP /D HAVE_SQLITE=1 /D "PHP_SQLITE_EXPORTS"

 # End Source File

 # Begin Source File

 

 SOURCE=.\libsqlite\src\func.c

-# SUBTRACT CPP /D HAVE_SQLITE=1 /D "PHP_SQLITE_EXPORTS"

 # End Source File

 # Begin Source File

 

 SOURCE=.\libsqlite\src\hash.c

-# SUBTRACT CPP /D HAVE_SQLITE=1 /D "PHP_SQLITE_EXPORTS"

 # End Source File

 # Begin Source File

 

@@ -161,17 +153,14 @@ SOURCE=.\libsqlite\src\hash.h
 # Begin Source File

 

 SOURCE=.\libsqlite\src\insert.c

-# SUBTRACT CPP /D HAVE_SQLITE=1 /D "PHP_SQLITE_EXPORTS"

 # End Source File

 # Begin Source File

 

 SOURCE=.\libsqlite\src\main.c

-# SUBTRACT CPP /D HAVE_SQLITE=1 /D "PHP_SQLITE_EXPORTS"

 # End Source File

 # Begin Source File

 

 SOURCE=.\libsqlite\src\opcodes.c

-# SUBTRACT CPP /D HAVE_SQLITE=1 /D "PHP_SQLITE_EXPORTS"

 # End Source File

 # Begin Source File

 

@@ -180,7 +169,6 @@ SOURCE=.\libsqlite\src\opcodes.h
 # Begin Source File

 

 SOURCE=.\libsqlite\src\os.c

-# SUBTRACT CPP /D HAVE_SQLITE=1 /D "PHP_SQLITE_EXPORTS"

 # End Source File

 # Begin Source File

 

@@ -189,7 +177,6 @@ SOURCE=.\libsqlite\src\os.h
 # Begin Source File

 

 SOURCE=.\libsqlite\src\pager.c

-# SUBTRACT CPP /D HAVE_SQLITE=1 /D "PHP_SQLITE_EXPORTS"

 # End Source File

 # Begin Source File

 

@@ -198,7 +185,6 @@ SOURCE=.\libsqlite\src\pager.h
 # Begin Source File

 

 SOURCE=.\libsqlite\src\parse.c

-# SUBTRACT CPP /D HAVE_SQLITE=1 /D "PHP_SQLITE_EXPORTS"

 # End Source File

 # Begin Source File

 

@@ -211,17 +197,14 @@ SOURCE=.\libsqlite\src\pragma.c
 # Begin Source File

 

 SOURCE=.\libsqlite\src\printf.c

-# SUBTRACT CPP /D HAVE_SQLITE=1 /D "PHP_SQLITE_EXPORTS"

 # End Source File

 # Begin Source File

 

 SOURCE=.\libsqlite\src\random.c

-# SUBTRACT CPP /D HAVE_SQLITE=1 /D "PHP_SQLITE_EXPORTS"

 # End Source File

 # Begin Source File

 

 SOURCE=.\libsqlite\src\select.c

-# SUBTRACT CPP /D HAVE_SQLITE=1 /D "PHP_SQLITE_EXPORTS"

 # End Source File

 # Begin Source File

 

@@ -292,27 +275,22 @@ SOURCE=.\libsqlite\src\sqliteInt.h
 # Begin Source File

 

 SOURCE=.\libsqlite\src\table.c

-# SUBTRACT CPP /D HAVE_SQLITE=1 /D "PHP_SQLITE_EXPORTS"

 # End Source File

 # Begin Source File

 

 SOURCE=.\libsqlite\src\tokenize.c

-# SUBTRACT CPP /D HAVE_SQLITE=1 /D "PHP_SQLITE_EXPORTS"

 # End Source File

 # Begin Source File

 

 SOURCE=.\libsqlite\src\trigger.c

-# SUBTRACT CPP /D HAVE_SQLITE=1 /D "PHP_SQLITE_EXPORTS"

 # End Source File

 # Begin Source File

 

 SOURCE=.\libsqlite\src\update.c

-# SUBTRACT CPP /D HAVE_SQLITE=1 /D "PHP_SQLITE_EXPORTS"

 # End Source File

 # Begin Source File

 

 SOURCE=.\libsqlite\src\util.c

-# SUBTRACT CPP /D HAVE_SQLITE=1 /D "PHP_SQLITE_EXPORTS"

 # End Source File

 # Begin Source File

 

@@ -321,7 +299,6 @@ SOURCE=.\libsqlite\src\vacuum.c
 # Begin Source File

 

 SOURCE=.\libsqlite\src\vdbe.c

-# SUBTRACT CPP /D HAVE_SQLITE=1 /D "PHP_SQLITE_EXPORTS"

 # End Source File

 # Begin Source File

 

@@ -330,14 +307,16 @@ SOURCE=.\libsqlite\src\vdbe.h
 # Begin Source File

 

 SOURCE=.\libsqlite\src\where.c

-# SUBTRACT CPP /D HAVE_SQLITE=1 /D "PHP_SQLITE_EXPORTS"

 # End Source File

 # End Group

 # Begin Source File

 

+SOURCE=.\php_sqlite.def

+# End Source File

+# Begin Source File

+

 SOURCE=.\sqlite.c

 # ADD CPP /I "libsqlite\src"

-# SUBTRACT CPP /I "..\..\..\php_build\include\lcrzo"

 # End Source File

 # End Group

 # Begin Group "Header Files"