paragui-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[paragui-cvs] CVS: paragui/VisualC/paragui_dynamic .cvsignore,1.1,1.2 Ve


From: Alexander Pipelka <address@hidden>
Subject: [paragui-cvs] CVS: paragui/VisualC/paragui_dynamic .cvsignore,1.1,1.2 Version.rc,1.1,1.2 resource.h,1.1,1.2 paragui_dynamic.dsp,1.1.1.1,1.2 paragui_dynamic.mak,1.1.1.1,1.2
Date: Sun, 18 Aug 2002 04:13:23 -0400

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

Modified Files:
        paragui_dynamic.dsp paragui_dynamic.mak 
Added Files:
        .cvsignore Version.rc resource.h 
Log Message:
synced with the devel-1-0-x tree.






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.2
diff -C2 -r1.1.1.1 -r1.2
*** paragui_dynamic.dsp 15 Apr 2002 13:22:29 -0000      1.1.1.1
--- paragui_dynamic.dsp 18 Aug 2002 08:12:51 -0000      1.2
***************
*** 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.2
diff -C2 -r1.1.1.1 -r1.2
*** paragui_dynamic.mak 15 Apr 2002 13:22:30 -0000      1.1.1.1
--- paragui_dynamic.mak 18 Aug 2002 08:12:51 -0000      1.2
***************
*** 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 
! 





reply via email to

[Prev in Thread] Current Thread [Next in Thread]