paragui-cvs
[Top][All Lists]
Advanced

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

[paragui-cvs] CVS: paragui/VisualC/test test.dsp,1.1.1.1,1.1.1.1.6.1 tes


From: Alexander Pipelka <address@hidden>
Subject: [paragui-cvs] CVS: paragui/VisualC/test test.dsp,1.1.1.1,1.1.1.1.6.1 test.mak,1.1.1.1,1.1.1.1.6.1
Date: Wed, 29 May 2002 11:34:11 -0400

Update of /cvsroot/paragui/paragui/VisualC/test
In directory subversions:/tmp/cvs-serv24542/VisualC/test

Modified Files:
      Tag: devel-1-0
        test.dsp test.mak 
Log Message:
adapted VC++ workspace
fixed PhysFS for Win32 (Ryan messed this up really badly)
compilation fixes



Index: test.dsp
===================================================================
RCS file: /cvsroot/paragui/paragui/VisualC/test/test.dsp,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.6.1
diff -C2 -r1.1.1.1 -r1.1.1.1.6.1
*** test.dsp    15 Apr 2002 13:22:29 -0000      1.1.1.1
--- test.dsp    29 May 2002 15:34:09 -0000      1.1.1.1.6.1
***************
*** 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 /subsystem:windows /machine:I386
! # ADD 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 sdl.lib paragui.lib freetype.lib sdlmain.lib /nologo 
/subsystem:windows /machine:I386 /out:"../../bin/test.exe" /libpath:"../../lib"
! # SUBTRACT LINK32 /pdb:none
  
  !ELSEIF  "$(CFG)" == "test - Win32 Debug"
--- 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 /subsystem:windows /machine:I386
! # ADD LINK32 sdl.lib paragui.lib sdlmain.lib /nologo /subsystem:windows 
/machine:I386 /out:"../../bin/test.exe" /libpath:"../../lib"
! # SUBTRACT LINK32 /pdb:none /nodefaultlib
  
  !ELSEIF  "$(CFG)" == "test - Win32 Debug"
***************
*** 71,75 ****
  # PROP Target_Dir ""
  # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D 
"_WINDOWS" /D "_MBCS" /YX /FD /GZ /c
! # ADD CPP /nologo /MD /W3 /Gm /vmg /GX /ZI /Od /I "../../src" /I 
"../../include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c
  # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
  # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
--- 71,76 ----
  # PROP Target_Dir ""
  # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D 
"_WINDOWS" /D "_MBCS" /YX /FD /GZ /c
! # ADD CPP /nologo /MD /W3 /Gm /vmg /GX /ZI /Od /I "../../src" /I 
"../../include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /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 /subsystem:windows /debug /machine:I386 /pdbtype:sept
! # ADD 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 sdld.lib freetyped.lib paraguid.lib sdlmain.lib /nologo 
/subsystem:windows /debug /machine:I386 /out:"../../bin/testd.exe" 
/pdbtype:sept /libpath:"../../lib"
! # SUBTRACT LINK32 /pdb:none
  
  !ENDIF 
--- 82,87 ----
  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 /subsystem:windows /debug /machine:I386 /pdbtype:sept
! # ADD LINK32 sdld.lib paraguid.lib sdlmain.lib /nologo /subsystem:windows 
/debug /machine:I386 /out:"../../bin/testd.exe" /pdbtype:sept 
/libpath:"../../lib"
! # SUBTRACT LINK32 /pdb:none /nodefaultlib
  
  !ENDIF 

Index: test.mak
===================================================================
RCS file: /cvsroot/paragui/paragui/VisualC/test/test.mak,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.6.1
diff -C2 -r1.1.1.1 -r1.1.1.1.6.1
*** test.mak    15 Apr 2002 13:22:29 -0000      1.1.1.1
--- test.mak    29 May 2002 15:34:09 -0000      1.1.1.1.6.1
***************
*** 94,98 ****
        
  LINK32=link.exe
! LINK32_FLAGS=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 paragui.lib freetype.lib sdlmain.lib /nologo 
/subsystem:windows /incremental:no /pdb:"$(OUTDIR)\test.pdb" /machine:I386 
/out:"../../bin/test.exe" /libpath:"../../lib" 
  LINK32_OBJS= \
        "$(INTDIR)\paratest.obj" \
--- 94,98 ----
        
  LINK32=link.exe
! LINK32_FLAGS=sdl.lib paragui.lib sdlmain.lib /nologo /subsystem:windows 
/incremental:no /pdb:"$(OUTDIR)\test.pdb" /machine:I386 
/out:"../../bin/test.exe" /libpath:"../../lib" 
  LINK32_OBJS= \
        "$(INTDIR)\paratest.obj" \
***************
*** 135,139 ****
  
  CPP=cl.exe
! CPP_PROJ=/nologo /MD /W3 /Gm /vmg /GX /ZI /Od /I "../../src" /I 
"../../include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" 
/Fp"$(INTDIR)\test.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
  
  .c{$(INTDIR)}.obj::
--- 135,139 ----
  
  CPP=cl.exe
! CPP_PROJ=/nologo /MD /W3 /Gm /vmg /GX /ZI /Od /I "../../src" /I 
"../../include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" 
/Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
  
  .c{$(INTDIR)}.obj::
***************
*** 175,179 ****
        
  LINK32=link.exe
! LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib 
advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib 
odbccp32.lib sdld.lib freetyped.lib paraguid.lib sdlmain.lib /nologo 
/subsystem:windows /incremental:yes /pdb:"$(OUTDIR)\testd.pdb" /debug 
/machine:I386 /out:"../../bin/testd.exe" /pdbtype:sept /libpath:"../../lib" 
  LINK32_OBJS= \
        "$(INTDIR)\paratest.obj" \
--- 175,179 ----
        
  LINK32=link.exe
! LINK32_FLAGS=sdld.lib paraguid.lib sdlmain.lib /nologo /subsystem:windows 
/incremental:yes /pdb:"$(OUTDIR)\testd.pdb" /debug /machine:I386 
/out:"../../bin/testd.exe" /pdbtype:sept /libpath:"../../lib" 
  LINK32_OBJS= \
        "$(INTDIR)\paratest.obj" \
***************
*** 207,217 ****
  
  "paragui_dynamic - Win32 Release" : 
!    cd "\projects\paragui\VisualC\paragui_dynamic"
!    $(MAKE) /$(MAKEFLAGS) /F .\paragui_dynamic.mak CFG="paragui_dynamic - 
Win32 Release" 
     cd "..\test"
  
  "paragui_dynamic - Win32 ReleaseCLEAN" : 
!    cd "\projects\paragui\VisualC\paragui_dynamic"
!    $(MAKE) /$(MAKEFLAGS) /F .\paragui_dynamic.mak CFG="paragui_dynamic - 
Win32 Release" RECURSE=1 CLEAN 
     cd "..\test"
  
--- 207,217 ----
  
  "paragui_dynamic - Win32 Release" : 
!    cd "\projects\paragui-1-0\VisualC\paragui_dynamic"
!    $(MAKE) /$(MAKEFLAGS) /F ".\paragui_dynamic.mak" CFG="paragui_dynamic - 
Win32 Release" 
     cd "..\test"
  
  "paragui_dynamic - Win32 ReleaseCLEAN" : 
!    cd "\projects\paragui-1-0\VisualC\paragui_dynamic"
!    $(MAKE) /$(MAKEFLAGS) /F ".\paragui_dynamic.mak" CFG="paragui_dynamic - 
Win32 Release" RECURSE=1 CLEAN 
     cd "..\test"
  
***************
*** 219,229 ****
  
  "paragui_dynamic - Win32 Debug" : 
!    cd "\projects\paragui\VisualC\paragui_dynamic"
!    $(MAKE) /$(MAKEFLAGS) /F .\paragui_dynamic.mak CFG="paragui_dynamic - 
Win32 Debug" 
     cd "..\test"
  
  "paragui_dynamic - Win32 DebugCLEAN" : 
!    cd "\projects\paragui\VisualC\paragui_dynamic"
!    $(MAKE) /$(MAKEFLAGS) /F .\paragui_dynamic.mak CFG="paragui_dynamic - 
Win32 Debug" RECURSE=1 CLEAN 
     cd "..\test"
  
--- 219,229 ----
  
  "paragui_dynamic - Win32 Debug" : 
!    cd "\projects\paragui-1-0\VisualC\paragui_dynamic"
!    $(MAKE) /$(MAKEFLAGS) /F ".\paragui_dynamic.mak" CFG="paragui_dynamic - 
Win32 Debug" 
     cd "..\test"
  
  "paragui_dynamic - Win32 DebugCLEAN" : 
!    cd "\projects\paragui-1-0\VisualC\paragui_dynamic"
!    $(MAKE) /$(MAKEFLAGS) /F ".\paragui_dynamic.mak" CFG="paragui_dynamic - 
Win32 Debug" RECURSE=1 CLEAN 
     cd "..\test"
  




reply via email to

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