[paragui-cvs] CVS: paragui/VisualC/paragui_dynamic paragui_dynamic.dsp,1.1.1.1.6.3,1.1.1.1.6.4 paragui_dynamic.mak,1.1.1.1.6.1,1.1.1.1.6.2

[Alexander Pipelka <address@hidden>]

Update of /cvsroot/paragui/paragui/VisualC/paragui_dynamic
In directory subversions:/tmp/cvs-serv13793/VisualC/paragui_dynamic

Modified Files:
      Tag: devel-1-0
        paragui_dynamic.dsp paragui_dynamic.mak 
Log Message:
VC++ workspace updates (included expat into Win32 version)
removed static Win32 build target
fix in pglayout



Index: paragui_dynamic.dsp
===================================================================
RCS file: /cvsroot/paragui/paragui/VisualC/paragui_dynamic/paragui_dynamic.dsp,v
retrieving revision 1.1.1.1.6.3
retrieving revision 1.1.1.1.6.4
diff -C2 -r1.1.1.1.6.3 -r1.1.1.1.6.4
*** paragui_dynamic.dsp 10 Jun 2002 09:18:27 -0000      1.1.1.1.6.3
--- paragui_dynamic.dsp 11 Jun 2002 11:27:51 -0000      1.1.1.1.6.4
***************
*** 44,48 ****
  # PROP Target_Dir ""
  # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" 
/D "_MBCS" /D "_USRDLL" /D "PARAGUI_DYNAMIC_EXPORTS" /YX /FD /c
! # ADD CPP /nologo /G5 /MD /W3 /vmg /GX /O2 /I "../../src/physfs" /I 
"../../src/themes" /I "../../src/core" /I "../../include" /D "ZLIB_DLL" /D 
"WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PARAGUI_EXPORTS" 
/D "PHYSFS_SUPPORTS_ZIP" /FD /c
  # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
  # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
--- 44,48 ----
  # PROP Target_Dir ""
  # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" 
/D "_MBCS" /D "_USRDLL" /D "PARAGUI_DYNAMIC_EXPORTS" /YX /FD /c
! # ADD CPP /nologo /G5 /MD /W3 /vmg /GX /O1 /I "../../src/physfs" /I 
"../../src/themes" /I "../../src/core" /I "../../include" /D "ZLIB_DLL" /D 
"WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PARAGUI_EXPORTS" 
/D "PHYSFS_SUPPORTS_ZIP" /FD /c
  # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
  # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
***************
*** 54,58 ****
  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 advapi32.lib sdl.lib freetype.lib sdl_image.lib zlib.lib 
expat.lib /nologo /dll /machine:I386 /out:"../../bin/paragui.dll" 
/implib:"../../lib/paragui.lib" /libpath:"../../lib"
  # SUBTRACT LINK32 /pdb:none
  
--- 54,58 ----
  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 advapi32.lib sdl.lib freetype.lib sdl_image.lib zlib.lib /nologo 
/dll /machine:I386 /out:"../../bin/paragui.dll" /implib:"../../lib/paragui.lib" 
/libpath:"../../lib"
  # SUBTRACT LINK32 /pdb:none
  
***************
*** 82,86 ****
  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 advapi32.lib sdl.lib freetype.lib sdl_image.lib zlib.lib 
expat.lib /nologo /dll /debug /machine:I386 /out:"../../bin/paraguid.dll" 
/implib:"../../lib/paraguid.lib" /pdbtype:sept /libpath:"../../lib"
  # SUBTRACT LINK32 /pdb:none
  
--- 82,86 ----
  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 advapi32.lib sdl.lib freetype.lib sdl_image.lib zlib.lib /nologo 
/dll /debug /machine:I386 /out:"../../bin/paraguid.dll" 
/implib:"../../lib/paraguid.lib" /pdbtype:sept /libpath:"../../lib"
  # SUBTRACT LINK32 /pdb:none
  
***************
*** 384,387 ****
--- 384,455 ----
  
  SOURCE=..\..\src\widgets\pgwindow.cpp
+ # End Source File
+ # End Group
+ # Begin Group "expat"
+ 
+ # PROP Default_Filter ""
+ # Begin Source File
+ 
+ SOURCE=..\..\src\expat\ascii.h
+ # End Source File
+ # Begin Source File
+ 
+ SOURCE=..\..\src\expat\asciitab.h
+ # End Source File
+ # Begin Source File
+ 
+ SOURCE=..\..\src\expat\expat.h
+ # End Source File
+ # Begin Source File
+ 
+ SOURCE=..\..\src\expat\iasciitab.h
+ # End Source File
+ # Begin Source File
+ 
+ SOURCE=..\..\src\expat\latin1tab.h
+ # End Source File
+ # Begin Source File
+ 
+ SOURCE=..\..\src\expat\nametab.h
+ # End Source File
+ # Begin Source File
+ 
+ SOURCE=..\..\src\expat\utf8tab.h
+ # End Source File
+ # Begin Source File
+ 
+ SOURCE=..\..\src\expat\xmldef.h
+ # End Source File
+ # Begin Source File
+ 
+ SOURCE=..\..\src\expat\xmlparse.c
+ # End Source File
+ # Begin Source File
+ 
+ SOURCE=..\..\src\expat\xmlparse.h
+ # End Source File
+ # Begin Source File
+ 
+ SOURCE=..\..\src\expat\xmlrole.c
+ # End Source File
+ # Begin Source File
+ 
+ SOURCE=..\..\src\expat\xmlrole.h
+ # End Source File
+ # Begin Source File
+ 
+ SOURCE=..\..\src\expat\xmltchar.h
+ # End Source File
+ # Begin Source File
+ 
+ SOURCE=..\..\src\expat\xmltok.c
+ # End Source File
+ # Begin Source File
+ 
+ SOURCE=..\..\src\expat\xmltok.h
+ # End Source File
+ # Begin Source File
+ 
+ SOURCE=..\..\src\expat\xmltok_impl.h
  # End Source File
  # End Group

Index: paragui_dynamic.mak
===================================================================
RCS file: /cvsroot/paragui/paragui/VisualC/paragui_dynamic/paragui_dynamic.mak,v
retrieving revision 1.1.1.1.6.1
retrieving revision 1.1.1.1.6.2
diff -C2 -r1.1.1.1.6.1 -r1.1.1.1.6.2
*** paragui_dynamic.mak 31 May 2002 08:09:16 -0000      1.1.1.1.6.1
--- paragui_dynamic.mak 11 Jun 2002 11:27:51 -0000      1.1.1.1.6.2
***************
*** 87,90 ****
--- 87,91 ----
        address@hidden "$(INTDIR)\physfs.obj"
        address@hidden "$(INTDIR)\physfs_byteorder.obj"
+       address@hidden "$(INTDIR)\physfsrwops.obj"
        address@hidden "$(INTDIR)\rotozoom.obj"
        address@hidden "$(INTDIR)\setpixel.obj"
***************
*** 95,99 ****
--- 96,104 ----
        address@hidden "$(INTDIR)\unzip.obj"
        address@hidden "$(INTDIR)\vc60.idb"
+       address@hidden "$(INTDIR)\Version.res"
        address@hidden "$(INTDIR)\win32.obj"
+       address@hidden "$(INTDIR)\xmlparse.obj"
+       address@hidden "$(INTDIR)\xmlrole.obj"
+       address@hidden "$(INTDIR)\xmltok.obj"
        address@hidden "$(INTDIR)\zip.obj"
        address@hidden "..\..\bin\paragui.dll"
***************
*** 105,109 ****
  
  CPP=cl.exe
! CPP_PROJ=/nologo /MD /W3 /vmg /GX /O2 /I "../../src/physfs" /I 
"../../src/themes" /I "../../src/core" /I "../../include" /D "ZLIB_DLL" /D 
"WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PARAGUI_EXPORTS" 
/D "PHYSFS_SUPPORTS_ZIP" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
  
  .c{$(INTDIR)}.obj::
--- 110,114 ----
  
  CPP=cl.exe
! CPP_PROJ=/nologo /G5 /MD /W3 /vmg /GX /O1 /I "../../src/physfs" /I 
"../../src/themes" /I "../../src/core" /I "../../include" /D "ZLIB_DLL" /D 
"WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PARAGUI_EXPORTS" 
/D "PHYSFS_SUPPORTS_ZIP" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
  
  .c{$(INTDIR)}.obj::
***************
*** 140,143 ****
--- 145,149 ----
  MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 
  RSC=rc.exe
+ RSC_PROJ=/l 0x405 /fo"$(INTDIR)\Version.res" /d "NDEBUG" 
  BSC32=bscmake.exe
  BSC32_FLAGS=/nologo /o"$(OUTDIR)\paragui_dynamic.bsc" 
***************
*** 145,149 ****
        
  LINK32=link.exe
! LINK32_FLAGS=advapi32.lib sdl.lib freetype.lib sdl_image.lib zlib.lib 
expat.lib /nologo /dll /incremental:no /pdb:"$(OUTDIR)\paragui.pdb" 
/machine:I386 /out:"../../bin/paragui.dll" /implib:"../../lib/paragui.lib" 
/libpath:"../../lib" 
  LINK32_OBJS= \
        "$(INTDIR)\theme_priv.obj" \
--- 151,155 ----
        
  LINK32=link.exe
! LINK32_FLAGS=advapi32.lib sdl.lib freetype.lib sdl_image.lib zlib.lib /nologo 
/dll /incremental:no /pdb:"$(OUTDIR)\paragui.pdb" /machine:I386 
/out:"../../bin/paragui.dll" /implib:"../../lib/paragui.lib" 
/libpath:"../../lib" 
  LINK32_OBJS= \
        "$(INTDIR)\theme_priv.obj" \
***************
*** 175,178 ****
--- 181,186 ----
        "$(INTDIR)\pgnavigator.obj" \
        "$(INTDIR)\pgsurfacecache.obj" \
+       "$(INTDIR)\pgtimerobject.obj" \
+       "$(INTDIR)\physfsrwops.obj" \
        "$(INTDIR)\pgfont.obj" \
        "$(INTDIR)\pgfont_impl.obj" \
***************
*** 206,211 ****
        "$(INTDIR)\pgwidgetlistex.obj" \
        "$(INTDIR)\pgwindow.obj" \
        "$(INTDIR)\paragui.obj" \
!       "$(INTDIR)\pgtimerobject.obj"
  
  "..\..\bin\paragui.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
--- 214,222 ----
        "$(INTDIR)\pgwidgetlistex.obj" \
        "$(INTDIR)\pgwindow.obj" \
+       "$(INTDIR)\xmlparse.obj" \
+       "$(INTDIR)\xmlrole.obj" \
+       "$(INTDIR)\xmltok.obj" \
        "$(INTDIR)\paragui.obj" \
!       "$(INTDIR)\Version.res"
  
  "..\..\bin\paragui.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
***************
*** 275,278 ****
--- 286,290 ----
        address@hidden "$(INTDIR)\physfs.obj"
        address@hidden "$(INTDIR)\physfs_byteorder.obj"
+       address@hidden "$(INTDIR)\physfsrwops.obj"
        address@hidden "$(INTDIR)\rotozoom.obj"
        address@hidden "$(INTDIR)\setpixel.obj"
***************
*** 284,288 ****
--- 296,304 ----
        address@hidden "$(INTDIR)\vc60.idb"
        address@hidden "$(INTDIR)\vc60.pdb"
+       address@hidden "$(INTDIR)\Version.res"
        address@hidden "$(INTDIR)\win32.obj"
+       address@hidden "$(INTDIR)\xmlparse.obj"
+       address@hidden "$(INTDIR)\xmlrole.obj"
+       address@hidden "$(INTDIR)\xmltok.obj"
        address@hidden "$(INTDIR)\zip.obj"
        address@hidden "$(OUTDIR)\paraguid.pdb"
***************
*** 331,334 ****
--- 347,351 ----
  MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 
  RSC=rc.exe
+ RSC_PROJ=/l 0x405 /fo"$(INTDIR)\Version.res" /d "_DEBUG" 
  BSC32=bscmake.exe
  BSC32_FLAGS=/nologo /o"$(OUTDIR)\paragui_dynamic.bsc" 
***************
*** 336,340 ****
        
  LINK32=link.exe
! LINK32_FLAGS=advapi32.lib sdl.lib freetype.lib sdl_image.lib zlib.lib 
expat.lib /nologo /dll /incremental:yes /pdb:"$(OUTDIR)\paraguid.pdb" /debug 
/machine:I386 /out:"../../bin/paraguid.dll" /implib:"../../lib/paraguid.lib" 
/pdbtype:sept /libpath:"../../lib" 
  LINK32_OBJS= \
        "$(INTDIR)\theme_priv.obj" \
--- 353,357 ----
        
  LINK32=link.exe
! LINK32_FLAGS=advapi32.lib sdl.lib freetype.lib sdl_image.lib zlib.lib /nologo 
/dll /incremental:yes /pdb:"$(OUTDIR)\paraguid.pdb" /debug /machine:I386 
/out:"../../bin/paraguid.dll" /implib:"../../lib/paraguid.lib" /pdbtype:sept 
/libpath:"../../lib" 
  LINK32_OBJS= \
        "$(INTDIR)\theme_priv.obj" \
***************
*** 366,369 ****
--- 383,388 ----
        "$(INTDIR)\pgnavigator.obj" \
        "$(INTDIR)\pgsurfacecache.obj" \
+       "$(INTDIR)\pgtimerobject.obj" \
+       "$(INTDIR)\physfsrwops.obj" \
        "$(INTDIR)\pgfont.obj" \
        "$(INTDIR)\pgfont_impl.obj" \
***************
*** 397,402 ****
        "$(INTDIR)\pgwidgetlistex.obj" \
        "$(INTDIR)\pgwindow.obj" \
        "$(INTDIR)\paragui.obj" \
!       "$(INTDIR)\pgtimerobject.obj"
  
  "..\..\bin\paraguid.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
--- 416,424 ----
        "$(INTDIR)\pgwidgetlistex.obj" \
        "$(INTDIR)\pgwindow.obj" \
+       "$(INTDIR)\xmlparse.obj" \
+       "$(INTDIR)\xmlrole.obj" \
+       "$(INTDIR)\xmltok.obj" \
        "$(INTDIR)\paragui.obj" \
!       "$(INTDIR)\Version.res"
  
  "..\..\bin\paraguid.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
***************
*** 592,595 ****
--- 614,623 ----
  
  
+ SOURCE=..\..\src\core\physfsrwops.c
+ 
+ "$(INTDIR)\physfsrwops.obj" : $(SOURCE) "$(INTDIR)"
+       $(CPP) $(CPP_PROJ) $(SOURCE)
+ 
+ 
  SOURCE=..\..\src\font\pgfont.cpp
  
***************
*** 778,785 ****
--- 806,837 ----
  
  
+ SOURCE=..\..\src\expat\xmlparse.c
+ 
+ "$(INTDIR)\xmlparse.obj" : $(SOURCE) "$(INTDIR)"
+       $(CPP) $(CPP_PROJ) $(SOURCE)
+ 
+ 
+ SOURCE=..\..\src\expat\xmlrole.c
+ 
+ "$(INTDIR)\xmlrole.obj" : $(SOURCE) "$(INTDIR)"
+       $(CPP) $(CPP_PROJ) $(SOURCE)
+ 
+ 
+ SOURCE=..\..\src\expat\xmltok.c
+ 
+ "$(INTDIR)\xmltok.obj" : $(SOURCE) "$(INTDIR)"
+       $(CPP) $(CPP_PROJ) $(SOURCE)
+ 
+ 
  SOURCE=..\..\src\paragui.cpp
  
  "$(INTDIR)\paragui.obj" : $(SOURCE) "$(INTDIR)"
        $(CPP) $(CPP_PROJ) $(SOURCE)
+ 
+ 
+ SOURCE=.\Version.rc
+ 
+ "$(INTDIR)\Version.res" : $(SOURCE) "$(INTDIR)"
+       $(RSC) $(RSC_PROJ) $(SOURCE)