[paragui-cvs] CVS: paragui/VisualC/paragui_dynamic .cvsignore,NONE,1.2.2.1 Version.rc,NONE,1.2.2.1 resource.h,NONE,1.2.2.1 paragui_dynamic.dsp,1.1.1.1,1.1.1.1.2.1 paragui_dynamic.mak,1.1.1.1,1.1.1.1.2.1

[Teunis Peters <address@hidden>]

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

Modified Files:
      Tag: devel-opengl
        paragui_dynamic.dsp paragui_dynamic.mak 
Added Files:
      Tag: devel-opengl
        .cvsignore Version.rc resource.h 
Log Message:
massive changes - updates from main trunk and various bugfixes


--- NEW FILE ---
*.plg
Debug
Release
*.txt
*.dep
*.opt
*.plg
*.ncb

--- NEW FILE ---
//Microsoft Developer Studio generated resource script.
//
#include "resource.h"

#define APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
//
// Generated from the TEXTINCLUDE 2 resource.
//
#include "afxres.h"

/////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS

/////////////////////////////////////////////////////////////////////////////
// Englisch (USA) resources

#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
#ifdef _WIN32
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
#pragma code_page(1252)
#endif //_WIN32

#ifndef _MAC
/////////////////////////////////////////////////////////////////////////////
//
// Version
//

VS_VERSION_INFO VERSIONINFO
 FILEVERSION 1,0,2,0
 PRODUCTVERSION 1,0,2,0
 FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
 FILEFLAGS 0x1L
#else
 FILEFLAGS 0x0L
#endif
 FILEOS 0x40004L
 FILETYPE 0x2L
 FILESUBTYPE 0x0L
BEGIN
    BLOCK "StringFileInfo"
    BEGIN
        BLOCK "040904b0"
        BEGIN
            VALUE "Comments", "www.paragui.org\0"
            VALUE "CompanyName", "\0"
            VALUE "FileDescription", "ParaGUI\0"
            VALUE "FileVersion", "1, 0, 2, 0\0"
            VALUE "InternalName", "ParaGUI\0"
            VALUE "LegalCopyright", "Copyright © 2002 Alexander Pipelka\0"
            VALUE "LegalTrademarks", "\0"
            VALUE "OriginalFilename", "paragui.dll\0"
            VALUE "PrivateBuild", "\0"
            VALUE "ProductName", "GUI library for SDL\0"
            VALUE "ProductVersion", "1, 0, 2, 0\0"
            VALUE "SpecialBuild", "\0"
        END
    END
    BLOCK "VarFileInfo"
    BEGIN
        VALUE "Translation", 0x409, 1200
    END
END

#endif    // !_MAC


#ifdef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
// TEXTINCLUDE
//

1 TEXTINCLUDE DISCARDABLE 
BEGIN
    "resource.h\0"
END

2 TEXTINCLUDE DISCARDABLE 
BEGIN
    "#include ""afxres.h""\r\n"
    "\0"
END

3 TEXTINCLUDE DISCARDABLE 
BEGIN
    "\r\n"
    "\0"
END

#endif    // APSTUDIO_INVOKED

#endif    // Englisch (USA) resources
/////////////////////////////////////////////////////////////////////////////



#ifndef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
// Generated from the TEXTINCLUDE 3 resource.
//


/////////////////////////////////////////////////////////////////////////////
#endif    // not APSTUDIO_INVOKED


--- NEW FILE ---
//{{NO_DEPENDENCIES}}
// Microsoft Developer Studio generated include file.
// Used by Version.rc
//

// Next default values for new objects
// 
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE        101
#define _APS_NEXT_COMMAND_VALUE         40001
#define _APS_NEXT_CONTROL_VALUE         1000
#define _APS_NEXT_SYMED_VALUE           101
#endif
#endif

Index: paragui_dynamic.dsp
===================================================================
RCS file: /cvsroot/paragui/paragui/VisualC/paragui_dynamic/paragui_dynamic.dsp,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -C2 -r1.1.1.1 -r1.1.1.1.2.1
*** paragui_dynamic.dsp 15 Apr 2002 13:22:29 -0000      1.1.1.1
--- paragui_dynamic.dsp 31 Aug 2002 04:01:22 -0000      1.1.1.1.2.1
***************
*** 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 /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/expat" /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,59 ****
  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 opengl32.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 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
  
  !ELSEIF  "$(CFG)" == "paragui_dynamic - Win32 Debug"
--- 54,64 ----
  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 physfs.lib 
/nologo /dll /machine:I386 /out:"../../bin/paragui.dll" 
/implib:"../../lib/paragui.lib" /libpath:"../../lib" 
/libpath:"../../src/physfs/Release"
  # SUBTRACT LINK32 /pdb:none
+ # Begin Special Build Tool
+ SOURCE="$(InputPath)"
+ PostBuild_Desc=Copying PhysFS DLL ...
+ PostBuild_Cmds=copy ..\..\src\physfs\Release\physfs.dll ..\..\bin
+ # End Special Build Tool
  
  !ELSEIF  "$(CFG)" == "paragui_dynamic - Win32 Debug"
***************
*** 71,75 ****
  # PROP Target_Dir ""
  # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D 
"_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PARAGUI_DYNAMIC_EXPORTS" /YX /FD /GZ /c
! # ADD CPP /nologo /MD /W3 /Gm /vmg /GX /ZI /Od /I "../../src/physfs" /I 
"../../src/core" /I "../../include" /I "../../src/themes" /D "ZLIB_DLL" /D 
"WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D 
"PARAGUI_DYNAMIC_EXPORTS" /D "PHYSFS_SUPPORTS_ZIP" /YX /FD /GZ /c
  # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
  # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
--- 76,81 ----
  # PROP Target_Dir ""
  # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D 
"_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "PARAGUI_DYNAMIC_EXPORTS" /YX /FD /GZ /c
! # ADD CPP /nologo /MD /W3 /Gm /vmg /GX /ZI /Od /I "../../src/expat" /I 
"../../src/physfs" /I "../../src/core" /I "../../include" /I "../../src/themes" 
/D "ZLIB_DLL" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D 
"PARAGUI_DYNAMIC_EXPORTS" /D "PHYSFS_SUPPORTS_ZIP" /FD /GZ /c
! # SUBTRACT CPP /YX
  # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
  # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
***************
*** 81,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 opengl32.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 sdl.lib freetyped.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
  
  !ENDIF 
--- 87,97 ----
  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 physfs.lib 
/nologo /dll /debug /machine:I386 /out:"../../bin/paraguid.dll" 
/implib:"../../lib/paraguid.lib" /pdbtype:sept /libpath:"../../lib" 
/libpath:"../../src/physfs/Debug"
  # SUBTRACT LINK32 /pdb:none
+ # Begin Special Build Tool
+ SOURCE="$(InputPath)"
+ PostBuild_Desc=Copying PhysFS DLL ...
+ PostBuild_Cmds=copy ..\..\src\physfs\Debug\physfs.dll ..\..\bin
+ # End Special Build Tool
  
  !ENDIF 
***************
*** 109,152 ****
  # End Source File
  # End Group
- # Begin Group "PhysFS"
- 
- # PROP Default_Filter "*.c, *.h *.cpp"
- # Begin Source File
- 
- SOURCE=..\..\src\physfs\archivers\dir.c
- # End Source File
- # Begin Source File
- 
- SOURCE=..\..\src\physfs\archivers\grp.c
- # End Source File
- # Begin Source File
- 
- SOURCE=..\..\src\physfs\physfs.c
- # End Source File
- # Begin Source File
- 
- SOURCE=..\..\src\physfs\physfs.h
- # End Source File
- # Begin Source File
- 
- SOURCE=..\..\src\physfs\physfs_internal.h
- # End Source File
- # Begin Source File
- 
- SOURCE=..\..\src\physfs\archivers\unzip.c
- # End Source File
- # Begin Source File
- 
- SOURCE=..\..\src\physfs\archivers\unzip.h
- # End Source File
- # Begin Source File
- 
- SOURCE=..\..\src\physfs\platform\win32.c
- # End Source File
- # Begin Source File
- 
- SOURCE=..\..\src\physfs\archivers\zip.c
- # End Source File
- # End Group
  # Begin Group "draw"
  
--- 120,123 ----
***************
*** 190,193 ****
--- 161,168 ----
  # Begin Source File
  
+ SOURCE=..\..\src\core\missing.cpp
+ # End Source File
+ # Begin Source File
+ 
  SOURCE=..\..\src\core\pgapplication.cpp
  # End Source File
***************
*** 232,235 ****
--- 207,222 ----
  SOURCE=..\..\src\core\pgsurfacecache.cpp
  # End Source File
+ # Begin Source File
+ 
+ SOURCE=..\..\src\core\pgtimerobject.cpp
+ # End Source File
+ # Begin Source File
+ 
+ SOURCE=..\..\src\core\physfsrwops.cpp
+ # End Source File
+ # Begin Source File
+ 
+ SOURCE=..\..\src\core\physfsrwops.h
+ # End Source File
  # End Group
  # Begin Group "font"
***************
*** 369,376 ****
--- 356,435 ----
  # 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
  # Begin Source File
  
  SOURCE=..\..\src\paragui.cpp
  # End Source File
+ # Begin Source File
+ 
+ SOURCE=.\Version.rc
+ # End Source File
  # End Group
  # Begin Group "Header Files"
***************
*** 491,498 ****
  # Begin Source File
  
- SOURCE=..\..\include\pgmsgmap.h
- # End Source File
- # Begin Source File
- 
  SOURCE=..\..\include\pgnavigator.h
  # End Source File
--- 550,553 ----
***************
*** 547,550 ****
--- 602,609 ----
  # Begin Source File
  
+ SOURCE=..\..\include\pgtimerobject.h
+ # End Source File
+ # Begin Source File
+ 
  SOURCE=..\..\include\pgwidget.h
  # End Source File
***************
*** 564,567 ****
--- 623,630 ----
  
  SOURCE=..\..\include\pgwindow.h
+ # End Source File
+ # Begin Source File
+ 
+ SOURCE=.\resource.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
retrieving revision 1.1.1.1.2.1
diff -C2 -r1.1.1.1 -r1.1.1.1.2.1
*** paragui_dynamic.mak 15 Apr 2002 13:22:30 -0000      1.1.1.1
--- paragui_dynamic.mak 31 Aug 2002 04:01:22 -0000      1.1.1.1.2.1
***************
*** 1,728 ****
! # Microsoft Developer Studio Generated NMAKE File, Based on 
paragui_dynamic.dsp
! !IF "$(CFG)" == ""
! CFG=paragui_dynamic - Win32 Debug
! !MESSAGE Keine Konfiguration angegeben. paragui_dynamic - Win32 Debug wird 
als Standard verwendet.
! !ENDIF 
! 
! !IF "$(CFG)" != "paragui_dynamic - Win32 Release" && "$(CFG)" != 
"paragui_dynamic - Win32 Debug"
! !MESSAGE Ungltige Konfiguration "$(CFG)" angegeben.
! !MESSAGE Sie k”nnen beim Ausfhren von NMAKE eine Konfiguration angeben
! !MESSAGE durch Definieren des Makros CFG in der Befehlszeile. Zum Beispiel:
[...1539 lines suppressed...]
! 
! "$(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)
! 
! 
! 
! !ENDIF 
!