cvs: php-gtk /win32 php_gtk.dsp scheme.dsp

fmk		Wed Aug  8 00:46:21 2001 EDT

  Modified files:              
    /php-gtk/win32	scheme.dsp php_gtk.dsp 
  Log:
  Fixing compile order and include paths for the debug version
  
Index: php-gtk/win32/scheme.dsp
diff -u php-gtk/win32/scheme.dsp:1.10 php-gtk/win32/scheme.dsp:1.11
--- php-gtk/win32/scheme.dsp:1.10	Fri Aug  3 15:25:22 2001
+++ php-gtk/win32/scheme.dsp	Wed Aug  8 00:46:21 2001
@@ -86,9 +86,10 @@
 
 !IF  "$(CFG)" == "Scheme - Win32 Release_TS"
 
+USERDEP__GDK_D="..\ext\gtk+\gdk.overrides"	"..\ext\gtk+\gdk.defs"	
 # Begin Custom Build
-InputDir=\php\php-gtk\ext\gtk+
-InputPath=..\ext\gtk+\gdk.defs
+InputDir=\PHP\php-gtk\ext\gtk+
+InputPath="..\ext\gtk+\gdk.defs"
 
 "$(InputDir)\gen_gdk.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	php.exe -q ..\generator\generator.php -o ext\gtk%%2b\gdk.overrides -p gdk ext\gtk%%2b\gdk.defs >..\ext\gtk+\gen_gdk.c
@@ -97,9 +98,10 @@
 
 !ELSEIF  "$(CFG)" == "Scheme - Win32 Debug_TS"
 
+USERDEP__GDK_D="..\ext\gtk+\gdk.overrides"	"..\ext\gtk+\gdk.defs"	
 # Begin Custom Build
-InputDir=\php\php-gtk\ext\gtk+
-InputPath=..\ext\gtk+\gdk.defs
+InputDir=\PHP\php-gtk\ext\gtk+
+InputPath="..\ext\gtk+\gdk.defs"
 
 "$(InputDir)\gen_gdk.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	php.exe -q ..\generator\generator.php -o ext\gtk%%2b\gdk.overrides -p gdk ext\gtk%%2b\gdk.defs >..\ext\gtk+\gen_gdk.c
@@ -116,9 +118,9 @@
 !IF  "$(CFG)" == "Scheme - Win32 Release_TS"
 
 # PROP Ignore_Default_Tool 1
-USERDEP__GENER="..\ext\gtk+\gen_gtk.c"	
+USERDEP__GENER="..\ext\gtk+\gen_gtk.c"	"..\ext\gtk+\gen_gdk.c"	
 # Begin Custom Build
-InputDir=\php\php-gtk\generator
+InputDir=\PHP\php-gtk\generator
 InputPath=..\generator\generator.php
 
 BuildCmds= \
@@ -136,13 +138,15 @@
 
 !ELSEIF  "$(CFG)" == "Scheme - Win32 Debug_TS"
 
+USERDEP__GENER="..\ext\gtk+\gen_gtk.c"	"..\ext\gtk+\gen_gdk.c"	
 # Begin Custom Build
-InputDir=\php\php-gtk\generator
+InputDir=\PHP\php-gtk\generator
 InputPath=..\generator\generator.php
 
 BuildCmds= \
-	grep -h "^PHP_GTK_EXPORT_CE" ..\ext\gtk%%2b\gen_gtk.c ..\ext\gtk%%2b\gen_gdk.c | sed -e "s!^!extern !" > ..\ext\gtk%%2b\gen_gtk.h \
-	grep -h "PHP_GTK_EXPORT_FUNC" ..\ext\gtk%%2b\gen_gtk.c ..\ext\gtk%%2b\gen_gdk.c | sed -e 's!$$!;!' >> ..\ext\gtk%%2b\gen_gtk.h \
+	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 \
+	grep -h "^PHP_GTK_EXPORT_CE" ..\ext\gtk+\gen_gtk.c ..\ext\gtk+\gen_gdk.c | sed -e "s/^/extern /" > ..\ext\gtk+\gen_gtk.h \
+	grep -h "PHP_GTK_EXPORT_FUNC" ..\ext\gtk+\gen_gtk.c ..\ext\gtk+\gen_gdk.c | sed -e "s/*obj)/&;/" >> ..\ext\gtk+\gen_gtk.h \
 	
 
 "$(InputDir)\gen_ce_gtk.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
@@ -161,9 +165,10 @@
 
 !IF  "$(CFG)" == "Scheme - Win32 Release_TS"
 
+USERDEP__GTK_D="..\ext\gtk+\gtk.overrides"	"..\ext\gtk+\gtk.defs"	
 # Begin Custom Build
-InputDir=\php\php-gtk\ext\gtk+
-InputPath=..\ext\gtk+\gtk.defs
+InputDir=\PHP\php-gtk\ext\gtk+
+InputPath="..\ext\gtk+\gtk.defs"
 
 "$(InputDir)\gen_gtk.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	php.exe -q ..\generator\generator.php -o ext\gtk%%2b\gtk.overrides -p gtk ext\gtk%%2b\gtk.defs >..\ext\gtk+\gen_gtk.c
@@ -172,9 +177,10 @@
 
 !ELSEIF  "$(CFG)" == "Scheme - Win32 Debug_TS"
 
+USERDEP__GTK_D="..\ext\gtk+\gtk.overrides"	"..\ext\gtk+\gtk.defs"	
 # Begin Custom Build
-InputDir=\php\php-gtk\ext\gtk+
-InputPath=..\ext\gtk+\gtk.defs
+InputDir=\PHP\php-gtk\ext\gtk+
+InputPath="..\ext\gtk+\gtk.defs"
 
 "$(InputDir)\gen_gtk.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	php.exe -q ..\generator\generator.php -o ext\gtk%%2b\gtk.overrides -p gtk ext\gtk%%2b\gtk.defs >..\ext\gtk+\gen_gtk.c
@@ -190,19 +196,21 @@
 
 !IF  "$(CFG)" == "Scheme - Win32 Release_TS"
 
+USERDEP__LIBGL="..\ext\libglade\libglade.overrides"	"..\ext\libglade\libglade.defs"	
 # Begin Custom Build
-InputDir=\php\php-gtk\ext\libglade
+InputDir=\PHP\php-gtk\ext\libglade
 InputPath=..\ext\libglade\libglade.defs
 
-"$(InputDir)\php_gtk_libglade.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+"$(InputDir)\gen_libglade.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	php.exe -q ..\generator\generator.php -o ext\libglade\libglade.overrides -p libglade ext\libglade\libglade.defs >..\ext\libglade\gen_libglade.c
 
 # End Custom Build
 
 !ELSEIF  "$(CFG)" == "Scheme - Win32 Debug_TS"
 
+USERDEP__LIBGL="..\ext\libglade\libglade.overrides"	"..\ext\libglade\libglade.defs"	
 # Begin Custom Build
-InputDir=\php\php-gtk\ext\libglade
+InputDir=\PHP\php-gtk\ext\libglade
 InputPath=..\ext\libglade\libglade.defs
 
 "$(InputDir)\gen_libglade.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
Index: php-gtk/win32/php_gtk.dsp
diff -u php-gtk/win32/php_gtk.dsp:1.9 php-gtk/win32/php_gtk.dsp:1.10
--- php-gtk/win32/php_gtk.dsp:1.9	Fri Aug  3 15:25:21 2001
+++ php-gtk/win32/php_gtk.dsp	Wed Aug  8 00:46:21 2001
@@ -69,7 +69,7 @@
 # PROP Intermediate_Dir "Debug_TS"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PHP_GTK_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\..\php4" /I "..\..\php4\main" /I "..\..\php4\Zend" /I "..\..\php4\TSRM" /I "..\..\src\gtk+" /I "..\..\src\gtk+\gdk" /I "..\..\src\glib" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PHP_GTK_EXPORTS" /D "PHP_WIN32" /D "ZEND_WIN32" /D ZTS=1 /D ZEND_DEBUG=1 /D HAVE_PHP_GTK=1 /D "COMPILE_DL_PHP_GTK" /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /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 "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PHP_GTK_EXPORTS" /D "PHP_WIN32" /D "ZEND_WIN32" /D ZTS=1 /D ZEND_DEBUG=1 /D HAVE_PHP_GTK=1 /D "COMPILE_DL_PHP_GTK" /YX /FD /GZ /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x409 /d "_DEBUG"