From 7594de6e1b2eb8df0797a803777648a98faf141c Mon Sep 17 00:00:00 2001 From: "Frank M. Kromann" Date: Tue, 10 Jul 2001 22:22:46 +0000 Subject: [PATCH] Moving generated files to ext\.. directories --- win32/php_gtk.dsp | 62 ++++++++++++++++++++++++++++++++--------------- win32/php_win.c | 2 +- win32/scheme.dsp | 43 ++++++++------------------------ 3 files changed, 54 insertions(+), 53 deletions(-) diff --git a/win32/php_gtk.dsp b/win32/php_gtk.dsp index 14e280c..c5800e4 100644 --- a/win32/php_gtk.dsp +++ b/win32/php_gtk.dsp @@ -43,7 +43,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" /D "_MBCS" /D "_USRDLL" /D "PHP_GTK_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MT /W3 /GX /O2 /I "." /I "..\\" /I "..\..\php4" /I "..\..\php4\main" /I "..\..\php4\Zend" /I "..\..\php4\TSRM" /I "..\..\src\gtk+" /I "..\..\src\gtk+\gdk" /I "..\..\src\glib" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PHP_GTK_EXPORTS" /D "PHP_WIN32" /D "ZEND_WIN32" /D ZTS=1 /D ZEND_DEBUG=0 /D HAVE_PHP_GTK=1 /D "COMPILE_DL_PHP_GTK" /YX /FD /I /php4" /I /php4/main" /I /php4/Zend" /I /php4/TSRM" /I /src/gtk+" /I /src/gtk+/gdk" /I /src/glib" /I /php4" /I /php4/main" /I /php4/Zend" /I /php4/TSRM" /I /src/gtk+" /I /src/gtk+/gdk" /I /src/glib" " " " " " " " " " " " " " " /c +# ADD CPP /nologo /MT /W3 /GX /O2 /I "." /I "..\\" /I "..\main" /I "..\..\php4" /I "..\..\php4\main" /I "..\..\php4\Zend" /I "..\..\php4\TSRM" /I "..\..\src\gtk+" /I "..\..\src\gtk+\gdk" /I "..\..\src\glib" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PHP_GTK_EXPORTS" /D "PHP_WIN32" /D "ZEND_WIN32" /D ZTS=1 /D ZEND_DEBUG=0 /D HAVE_PHP_GTK=1 /D "COMPILE_DL_PHP_GTK" /YX /FD /I /php4" /I /php4/main" /I /php4/Zend" /I /php4/TSRM" /I /src/gtk+" /I /src/gtk+/gdk" /I /src/glib" /I /php4" /I /php4/main" /I /php4/Zend" /I /php4/TSRM" /I /src/gtk+" /I /src/gtk+/gdk" /I /src/glib" " " " " " " " " " " " " " " /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "NDEBUG" @@ -92,23 +92,19 @@ LINK32=link.exe # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" # Begin Source File -SOURCE=..\src\gen_gdk.c +SOURCE=..\main\php_gtk.c # End Source File # Begin Source File -SOURCE=..\src\gen_gtk.c +SOURCE=..\main\php_gtk_ext.w32.c # End Source File # Begin Source File -SOURCE=..\src\php_gtk.c +SOURCE=..\main\php_gtk_object.c # End Source File # Begin Source File -SOURCE=..\src\php_gtk_object.c -# End Source File -# Begin Source File - -SOURCE=..\src\php_gtk_util.c +SOURCE=..\main\php_gtk_util.c # End Source File # End Group # Begin Group "Header Files" @@ -116,19 +112,11 @@ SOURCE=..\src\php_gtk_util.c # PROP Default_Filter "h;hpp;hxx;hm;inl" # Begin Source File -SOURCE=..\src\php_gtk.h +SOURCE=..\main\php_gtk.h # End Source File # Begin Source File -SOURCE=..\src\php_gtk_gen_reg_items.h -# End Source File -# Begin Source File - -SOURCE=..\src\php_gtk_gen_reg_items_decl.h -# End Source File -# Begin Source File - -SOURCE=..\src\php_gtk_module.h +SOURCE=..\main\php_gtk_module.h # End Source File # End Group # Begin Group "Resource Files" @@ -167,6 +155,42 @@ SOURCE=..\generator\libglade.defs SOURCE=..\generator\libglade.overrides # End Source File # End Group +# Begin Group "Gtk+" + +# PROP Default_Filter "" +# Begin Group "Source Files No. 1" + +# PROP Default_Filter "*.c" +# Begin Source File + +SOURCE="..\ext\gtk+\gen_ce_gtk.h" +# End Source File +# Begin Source File + +SOURCE="..\ext\gtk+\gen_gdk.c" +# End Source File +# Begin Source File + +SOURCE="..\ext\gtk+\gen_gtk.c" +# End Source File +# Begin Source File + +SOURCE="..\ext\gtk+\php_gtk+.c" +# End Source File +# Begin Source File + +SOURCE="..\ext\gtk+\php_gtk+_types.c" +# End Source File +# End Group +# Begin Group "Header Files No. 1" + +# PROP Default_Filter "*.h" +# Begin Source File + +SOURCE="..\ext\gtk+\php_gtk+.h" +# End Source File +# End Group +# End Group # Begin Source File SOURCE=.\README.txt diff --git a/win32/php_win.c b/win32/php_win.c index d77f86a..6ae2573 100644 --- a/win32/php_win.c +++ b/win32/php_win.c @@ -10,7 +10,7 @@ int WINAPI WinMain( { char *args[4], *prog; - prog = "d:\\php4\\php.exe"; + prog = "c:\\php4\\php.exe"; args[0] = prog; args[1] = "-q"; args[2] = lpCmdLine; diff --git a/win32/scheme.dsp b/win32/scheme.dsp index 457a926..ba4d34b 100644 --- a/win32/scheme.dsp +++ b/win32/scheme.dsp @@ -75,36 +75,13 @@ LIB32=link.exe -lib # Begin Target -InputDir=..\src +InputDir=..\main # Name "Scheme - Win32 Release_TS" # Name "Scheme - Win32 Debug_TS" # Begin Group "Parsers" # PROP Default_Filter "php" -# Begin Source File - -SOURCE=..\generator\make_reg_items.php - -!IF "$(CFG)" == "Scheme - Win32 Release_TS" - -# Begin Custom Build -BuildCmds=php.exe -q ..\generator\make_reg_items.php gtk gdk -"$(InputDir)\php_gtk_gen_reg_items.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - $(BuildCmds) -# End Custom Build - -!ELSEIF "$(CFG)" == "Scheme - Win32 Debug_TS" - -# Begin Custom Build -BuildCmds=php.exe -q ..\generator\make_reg_items.php gtk gdk -"$(InputDir)\php_gtk_gen_reg_items.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - $(BuildCmds) -# End Custom Build - -!ENDIF - -# End Source File # Begin Source File @@ -113,7 +90,7 @@ SOURCE=..\ext\gtk+\gtk.defs ..\ext\gtk+\gtk-extrafuncs.defs ..\ext\gtk+\gtk.over !IF "$(CFG)" == "Scheme - Win32 Release_TS" # Begin Custom Builds -BuildCmds=php.exe -q ..\generator\generator.php -o ext\gtk%%2b\gtk.overrides -p gtk ext\gtk%%2b\gtk.defs >..\src\gen_gtk.c +BuildCmds=php.exe -q ..\generator\generator.php -o ext\gtk%%2b\gtk.overrides -p gtk ext\gtk%%2b\gtk.defs >..\ext\gtk+\gen_gtk.c "$(InputDir)\gen_gtk.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" $(BuildCmds) # End Custom Build @@ -121,7 +98,7 @@ BuildCmds=php.exe -q ..\generator\generator.php -o ext\gtk%%2b\gtk.overrides -p !ELSEIF "$(CFG)" == "Scheme - Win32 Debug_TS" # Begin Custom Build -BuildCmds=php.exe -q ..\generator\generator.php -o ext\gtk%%2b\gtk.overrides -p gtk ext\gtk%%2b\gtk.defs >..\src\gen_gtk.c +BuildCmds=php.exe -q ..\generator\generator.php -o ext\gtk%%2b\gtk.overrides -p gtk ext\gtk%%2b\gtk.defs >..\ext\gtk+\gen_gtk.c "$(InputDir)\gen_gtk.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" $(BuildCmds) # End Custom Build @@ -137,7 +114,7 @@ SOURCE=..\ext\gtk+\gdk.defs ..\ext\gtk+\gdk.overrides !IF "$(CFG)" == "Scheme - Win32 Release_TS" # Begin Custom Build -BuildCmds=php.exe -q ..\generator\generator.php -o ext\gtk%%2b\gdk.overrides -p gdk ext\gtk%%2b\gdk.defs >..\src\gen_gdk.c +BuildCmds=php.exe -q ..\generator\generator.php -o ext\gtk%%2b\gdk.overrides -p gdk ext\gtk%%2b\gdk.defs >..\ext\gtk+\gen_gdk.c "$(InputDir)\gen_gdk.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" $(BuildCmds) # End Custom Build @@ -145,7 +122,7 @@ BuildCmds=php.exe -q ..\generator\generator.php -o ext\gtk%%2b\gdk.overrides -p !ELSEIF "$(CFG)" == "Scheme - Win32 Debug_TS" # Begin Custom Build -BuildCmds=php.exe -q ..\generator\generator.php -o ext\gtk%%2b\gdk.overrides -p gdk ext\gtk%%2b\gdk.defs >..\src\gen_gdk.c +BuildCmds=php.exe -q ..\generator\generator.php -o ext\gtk%%2b\gdk.overrides -p gdk ext\gtk%%2b\gdk.defs >..\ext\gtk+\gen_gdk.c "$(InputDir)\gen_gdk.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" $(BuildCmds) # End Custom Build @@ -156,12 +133,12 @@ BuildCmds=php.exe -q ..\generator\generator.php -o ext\gtk%%2b\gdk.overrides -p # Begin Source File -SOURCE=..\generator\generator.php ..\src\gen_gtk.c ..\src\gen_gdk.c +SOURCE=..\generator\generator.php ..\ext\gtk+\gen_gtk.c ..\ext\gtk+\gen_gdk.c !IF "$(CFG)" == "Scheme - Win32 Release_TS" # Begin Custom Build -BuildCmds=grep -h "^PHP_GTK_EXPORT_CE" ..\src\gen_gtk.c ..\src\gen_gdk.c | sed -e "s!^!extern !" > ..\src\gen_ce_gtk.h +BuildCmds=grep -h "^PHP_GTK_EXPORT_CE" ..\ext\gtk+\gen_gtk.c ..\ext\gtk+\gen_gdk.c | sed -e "s!^!extern !" > ..\ext\gtk+\gen_ce_gtk.h "$(InputDir)\gen_ce_gtk.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" $(BuildCmds) # End Custom Build @@ -169,7 +146,7 @@ BuildCmds=grep -h "^PHP_GTK_EXPORT_CE" ..\src\gen_gtk.c ..\src\gen_gdk.c | sed - !ELSEIF "$(CFG)" == "Scheme - Win32 Debug_TS" # Begin Custom Build -BuildCmds=grep -h "^PHP_GTK_EXPORT_CE" ..\src\gen_gtk.c ..\src\gen_gdk.c | sed -e "s!^!extern !" > ..\src\gen_ce_gtk.h +BuildCmds=grep -h "^PHP_GTK_EXPORT_CE" ..\ext\gtk+\gen_gtk.c ..\ext\gtk+\gen_gdk.c | sed -e "s!^!extern !" > ..\ext\gtk+\gen_ce_gtk.h "$(InputDir)\gen_ce_gtk.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" $(BuildCmds) # End Custom Build @@ -185,7 +162,7 @@ SOURCE=..\ext\libglade\libglade.defs ..\ext\libglade\libglade.overrides !IF "$(CFG)" == "Scheme - Win32 Release_TS" # Begin Custom Build -BuildCmds=php.exe -q ..\generator\generator.php -o ext\libglade\libglade.overrides -p libglade ext\libglade\libglade.defs >..\src\gen_libglade.c +BuildCmds=php.exe -q ..\generator\generator.php -o ext\libglade\libglade.overrides -p libglade ext\libglade\libglade.defs >..\ext\libglade\gen_libglade.c "$(InputDir)\php_gtk_gen_libglade.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" $(BuildCmds) # End Custom Build @@ -193,7 +170,7 @@ BuildCmds=php.exe -q ..\generator\generator.php -o ext\libglade\libglade.overrid !ELSEIF "$(CFG)" == "Scheme - Win32 Debug_TS" # Begin Custom Build -BuildCmds=php.exe -q ..\generator\generator.php -o ext\libglade\libglade.overrides -p libglade ext\libglade\libglade.defs >..\src\gen_libglade.c +BuildCmds=php.exe -q ..\generator\generator.php -o ext\libglade\libglade.overrides -p libglade ext\libglade\libglade.defs >..\ext\libglade\gen_libglade.c "$(InputDir)\gen_libglade.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" $(BuildCmds) # End Custom Build