From e1f79cfb4072c0bee6c594a643cf51fd562d1503 Mon Sep 17 00:00:00 2001 From: leo Date: Sun, 26 Nov 2000 20:18:36 +0000 Subject: VC++ fixes git-svn-id: http://svn.leocad.org/trunk@170 c7d43263-9d01-0410-8a33-9dba5d9f93d6 --- common/curve.cpp | 5 ++-- tools/update/update.dsp | 2 +- win/3dsftk/3dsftk.dsp | 2 +- win/LeoCAD.dsp | 62 +++++++++++++++++++++---------------------------- win/Moddlg.cpp | 2 +- win/jpeglib/jpeglib.dsp | 2 +- win/libpng/libpng.dsp | 2 +- win/zlib/zlib.dsp | 2 +- 8 files changed, 36 insertions(+), 43 deletions(-) diff --git a/common/curve.cpp b/common/curve.cpp index db1c5aa..abb4f5b 100755 --- a/common/curve.cpp +++ b/common/curve.cpp @@ -2,6 +2,7 @@ // #include +#include #include "globals.h" #include "curve.h" #include "opengl.h" @@ -572,8 +573,8 @@ void Curve::TesselateHose () for (int k = 0; k < steps2; k++) { float *o = &verts[(j*steps2+k)*3]; - v[0] = cos (2.0 * M_PI * k / steps2) * 0.15f; - v[1] = sin (2.0 * M_PI * k / steps2) * 0.15f; + v[0] = (float)(cos (2.0 * M_PI * k / steps2) * 0.15); + v[1] = (float)(sin (2.0 * M_PI * k / steps2) * 0.15); v[2] = 0; m.TransformPoint (o, v); } diff --git a/tools/update/update.dsp b/tools/update/update.dsp index 9dd0671..fa7ec51 100755 --- a/tools/update/update.dsp +++ b/tools/update/update.dsp @@ -63,7 +63,7 @@ LINK32=link.exe # PROP Intermediate_Dir "Debug" # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /W3 /Gm /GX /Zi /Od /I "../../common" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "LC_WINDOWS" /YX /FD /c +# ADD CPP /nologo /W3 /Gm /GX /Zi /Od /I "../../common" /I "../../win" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "LC_WINDOWS" /YX /FD /c # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" BSC32=bscmake.exe diff --git a/win/3dsftk/3dsftk.dsp b/win/3dsftk/3dsftk.dsp index 3efcc6d..40379d0 100644 --- a/win/3dsftk/3dsftk.dsp +++ b/win/3dsftk/3dsftk.dsp @@ -60,7 +60,7 @@ LIB32=link.exe -lib # PROP Intermediate_Dir "Debug" # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c +# ADD CPP /nologo /G6 /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo diff --git a/win/LeoCAD.dsp b/win/LeoCAD.dsp index 462c005..95cf5c5 100644 --- a/win/LeoCAD.dsp +++ b/win/LeoCAD.dsp @@ -42,7 +42,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /Yu"stdafx.h" /FD /c -# ADD CPP /nologo /MT /W4 /GX /O2 /I "../common" /I "../win" /D "NDEBUG" /D "WIN32" /D "LC_WINDOWS" /Yu"stdafx.h" /FD /c +# ADD CPP /nologo /MT /W3 /GX /O2 /I "../common" /I "../win" /D "NDEBUG" /D "WIN32" /D "LC_WINDOWS" /Yu"stdafx.h" /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32 # ADD BASE RSC /l 0x409 /d "NDEBUG" @@ -52,7 +52,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 /nologo /subsystem:windows /machine:I386 -# ADD LINK32 vfw32.lib jpeglib.lib 3dsftk.lib libpng.lib zlib.lib /nologo /subsystem:windows /map /machine:I386 /libpath:"./jpeglib/release" /libpath:"./3dsftk/release" /libpath:"./libpng/release" /libpath:"./zlib/release" +# ADD LINK32 vfw32.lib jpeglib.lib 3dsftk.lib libpng.lib zlib.lib /nologo /subsystem:windows /map /machine:I386 /nodefaultlib:"libc.lib" /libpath:"./jpeglib/release" /libpath:"./3dsftk/release" /libpath:"./libpng/release" /libpath:"./zlib/release" !ELSEIF "$(CFG)" == "LeoCAD - Win32 Debug" @@ -78,8 +78,8 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept -# ADD LINK32 vfw32.lib jpeglib.lib 3dsftk.lib libpng.lib zlib.lib /nologo /subsystem:windows /debug /machine:I386 /libpath:"./jpeglib/debug" /libpath:"./3dsftk/debug" /libpath:"./libpng/debug" /libpath:"./zlib/debug" -# SUBTRACT LINK32 /profile +# ADD LINK32 vfw32.lib jpeglib.lib 3dsftk.lib libpng.lib zlib.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /libpath:"./jpeglib/debug" /libpath:"./3dsftk/debug" /libpath:"./libpng/debug" /libpath:"./zlib/debug" +# SUBTRACT LINK32 /pdb:none !ENDIF @@ -178,13 +178,6 @@ USERDEP__LEOCA="$(ProjDir)\hlp\AfxCore.rtf" "$(ProjDir)\hlp\AfxPrint.rtf" # Begin Source File SOURCE=.\Leocad.rc - -!IF "$(CFG)" == "LeoCAD - Win32 Release" - -!ELSEIF "$(CFG)" == "LeoCAD - Win32 Debug" - -!ENDIF - # End Source File # Begin Source File @@ -821,6 +814,10 @@ SOURCE=.\res\Zoomrect.cur # PROP Default_Filter "" # Begin Source File +SOURCE=".\$(ProjDir)\hlp\AfxCore.rtf" +# End Source File +# Begin Source File + SOURCE=.\hlp\AfxCore.rtf # End Source File # Begin Source File @@ -829,6 +826,10 @@ SOURCE=.\hlp\AfxOleSv.rtf # End Source File # Begin Source File +SOURCE=".\$(ProjDir)\hlp\AfxPrint.rtf" +# End Source File +# Begin Source File + SOURCE=.\hlp\AfxPrint.rtf # End Source File # Begin Source File @@ -933,6 +934,10 @@ SOURCE=.\hlp\Scmin.bmp # PROP Default_Filter "" # Begin Source File +SOURCE=..\common\array.h +# End Source File +# Begin Source File + SOURCE=..\Common\camera.cpp # SUBTRACT CPP /YX /Yc /Yu # End Source File @@ -942,6 +947,15 @@ SOURCE=..\Common\camera.h # End Source File # Begin Source File +SOURCE=..\common\curve.cpp +# SUBTRACT CPP /YX /Yc /Yu +# End Source File +# Begin Source File + +SOURCE=..\common\curve.h +# End Source File +# Begin Source File + SOURCE=..\Common\defines.h # End Source File # Begin Source File @@ -1034,15 +1048,7 @@ SOURCE=..\Common\matrix.h # Begin Source File SOURCE=..\common\message.cpp - -!IF "$(CFG)" == "LeoCAD - Win32 Release" - -!ELSEIF "$(CFG)" == "LeoCAD - Win32 Debug" - # SUBTRACT CPP /YX /Yc /Yu - -!ENDIF - # End Source File # Begin Source File @@ -1051,15 +1057,7 @@ SOURCE=..\common\message.h # Begin Source File SOURCE=..\common\minifig.cpp - -!IF "$(CFG)" == "LeoCAD - Win32 Release" - -!ELSEIF "$(CFG)" == "LeoCAD - Win32 Debug" - # SUBTRACT CPP /YX /Yc /Yu - -!ENDIF - # End Source File # Begin Source File @@ -1068,15 +1066,7 @@ SOURCE=..\common\minifig.h # Begin Source File SOURCE=..\common\object.cpp - -!IF "$(CFG)" == "LeoCAD - Win32 Release" - -!ELSEIF "$(CFG)" == "LeoCAD - Win32 Debug" - # SUBTRACT CPP /YX /Yc /Yu - -!ENDIF - # End Source File # Begin Source File @@ -1088,6 +1078,8 @@ SOURCE=..\common\opengl.cpp !IF "$(CFG)" == "LeoCAD - Win32 Release" +# ADD CPP /YX + !ELSEIF "$(CFG)" == "LeoCAD - Win32 Debug" # SUBTRACT CPP /YX /Yc /Yu diff --git a/win/Moddlg.cpp b/win/Moddlg.cpp index 9d12db1..ef81fbb 100644 --- a/win/Moddlg.cpp +++ b/win/Moddlg.cpp @@ -169,7 +169,7 @@ void CModifyDialog::UpdateInfo(void* pObject, BYTE nType) pPiece->GetPosition(pos); pPiece->GetRotation(rot); Matrix mat(rot, pos); - mat.GetEulerAngles(rot); + mat.ToEulerAngles(rot); m_fPosX = pos[0]; m_fPosY = pos[1]; diff --git a/win/jpeglib/jpeglib.dsp b/win/jpeglib/jpeglib.dsp index 0751f12..38adaab 100644 --- a/win/jpeglib/jpeglib.dsp +++ b/win/jpeglib/jpeglib.dsp @@ -60,7 +60,7 @@ LIB32=link.exe -lib # PROP Intermediate_Dir "Debug" # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c +# ADD CPP /nologo /G6 /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo diff --git a/win/libpng/libpng.dsp b/win/libpng/libpng.dsp index 8e4dd3a..2b5b002 100755 --- a/win/libpng/libpng.dsp +++ b/win/libpng/libpng.dsp @@ -60,7 +60,7 @@ LIB32=link.exe -lib # PROP Intermediate_Dir "Debug" # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /W3 /GX /Z7 /Od /I "../zlib" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c +# ADD CPP /nologo /G6 /W3 /GX /Z7 /Od /I "../zlib" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo diff --git a/win/zlib/zlib.dsp b/win/zlib/zlib.dsp index a58553c..77922ac 100755 --- a/win/zlib/zlib.dsp +++ b/win/zlib/zlib.dsp @@ -60,7 +60,7 @@ LIB32=link.exe -lib # PROP Intermediate_Dir "Debug" # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c +# ADD CPP /nologo /G6 /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo -- cgit v1.2.3