From ca7c001fce978b680543f8338a404b8c0701a935 Mon Sep 17 00:00:00 2001 From: "Kevin M. Rosenberg" Date: Tue, 20 Feb 2001 07:00:12 +0000 Subject: [PATCH] r559: no message --- images/logo16.bmp | Bin 824 -> 824 bytes images/logo32.bmp | Bin 3128 -> 3128 bytes msvc/ctsim/ctsim.dsp | 44 ++++++++++++++++++++++++++++------- msvc/ctsim/ctsim.plg | 18 +++++++------- msvc/ctsim/logo.ico | Bin 4150 -> 2238 bytes msvc/ctsimtext/ctsimtext.dsp | 4 ++-- msvc/ctsimtext/logo.ico | Bin 4150 -> 2238 bytes msvc/libctsim/libctsim.dsp | 18 ++++++++++++++ 8 files changed, 66 insertions(+), 18 deletions(-) diff --git a/images/logo16.bmp b/images/logo16.bmp index 365bc87501b3ed9aa0a86fee408ecab7c5340ae4..463bd88209c7fbf5a9560c78df59e7122210b542 100644 GIT binary patch literal 824 zcmY*XyKdA_5FMZZktRY2K?jOJRHQ=`G$2Z7kmx8V$p_FN1Qj2^Ptc^HL6k^*1cA_P zvYXhu4(qkA?`s~+wY^?*bsyvLnVB<>$Il*IfOg&2`>vkt{+xsBtv+2>wz{)c$a=A` zkIs4XwmiF+o$hA&)02~rv)MsW2+8S%5Xb)s5+J2P&>#dI5_F*WO>dKd3sr780PW_!@`71DEL8LAQ|KafeVI2`eK z#5?p-xk3muMyAi zCxetYOCam;%U6k>61|nx`hO3ZZ}V4JtnfR+uL$XKW7Rxz{)p%sk>#pXZ9Pp_&%KZ& zyKotmd7#W2N1vT>#*F+zQ{sS+@rB`QvleS(ZJ|h6>RZ?Ea3__r9C-|{_c*%6B0+^hA ABLDyZ diff --git a/images/logo32.bmp b/images/logo32.bmp index a927389f378336dfd386883d8cca9771f5d33d36..a72657b42c0c88f55d7011002dbeda8aaa5f1dcb 100644 GIT binary patch literal 3128 zcmbVOJ&YSg6doi%h#(~(Kr~1+NPvI_>G)|tX(J*5X%L8l9wBIGX%MOS5eSM1lqQ6N z3Z)1I-HBYJGxxiRMc7_#0(GrI-f|E5v_KH{7AU&@~l&2Z$Q5DZW#IG(4Ni6Rwo z$k(r{9)NJZ#aUd4wUi&0O{6^vP99&xiX82X>nfjt3I5Rz4wMxv-MFD-t&?R^&y4yv zc8rFbKWng67xCE?-?G@z5$pGv?owvNYt)imegUqQ~K_|2vQ1R5w> zUS>CMvQCF}yUL6*LhV?pYG>*rA(=?0m#Z_?* zY$If165pL2%dR7s$M~& z>J)Jb+W?B|N5t5&Cz>x-iq@90==vkt7NnJ^Q5Usea zK=|;y>veIt=q>!7f@=Zb2t+@eQz~6m-=6fNw}?I=`i00KQWv&+83`A+Cm|+eDhpxqwDljcwxY kMne&pYx=}VAZXtj!$y5rN7Dj&SjRSf;p;=R2#T@)0G>qStN;K2 literal 3128 zcmbW3%WEW66o=0&bQH}jRB%8A6+uCQZX5*{1Fm#H5SMPol_Cftj<|3YaHlSP`~hNI zxe#29iwT;^kVs6Yt2^m*x;u}4RKKd9^}bbSem9j=D)s1$bE(I<=id9(sdMf<_rCS+ z8;{aaxq|0QxSu_~FVJO3L3!*EB6*(_&Mv<1Te@9T2VWG5*K)aeMR{Rs3)idp{CoNQ zSB1i&qErqJ*s`)2=`A3S$9B6t9ryH~O`C)u=J@3}G#bs7O4nCb?vzUGIO(i}*0MyW zqidQegpbBgljN92h>MlVXSZ+nRW$*NE2dMs+cjL*3mRb4D=}JD)i7RLTidEuq4%a>LkmlE@XS-_;;^PW+Zzl+6_(P!Se?u<2+hC=tuppY;24*E&K$q-LCF9BGd!|>aX7ypG@=1^>udLfHR#s!=V|2qq@iZ z@cr?bAF9`tdL59!cp;7_O!O^FY`3wF5ZsU%3Yer< zVPShJ&GQ5m6lykTpwW0p9hEk7Bplg<4(OKZMqU54T<-Tx*G=I!ndd_O&JML&60*BX zwVD*FRa#v=hwr+dmrAYHG_*M?{0Rv7aDr`7J}*(D5vi&ad<4a!#YHj=>KK{!Ghf@< z%Hn?$@VlmT2(0xyYBs6SpuIiX-LgH!&|{KuR;IFNsY_yUetLnxP}CNck!Qm!(8%e*bTp=J&SSYOA9 zD43r%^NTS)sLSsBH`~~J!=GZFLG{Z0)Y~{%O(fsyf01uvC znBN4sK6%I$OfK@9c+L_xEccf1jp(vGkpaXe?s@W8uyYLtr@cOm@)Pn?%pWuV!8|-c zrM{8yvD*esNYVI(Aj*hD>W2O_^L6ImnA@qivq~HfLgRxL$MIyA_Wd&R#fZ&MFu%|I z3o};SJ(j@QWKK3s#~WHd9l__A-(miNdH)`vk#0C7z~K?aspyQ&g=TNT=bcmC|Bzrg zjyIv(lOuih^@(YAbWYoGlKrC^gbxQZ9M7W4R2i{AbozY*LTZPY64AsW#Sk1UV@)%v z_)VN|Rds3@ZZd&jAe7j<(FfNIpUn6Knn1vhU~08mlV($1fq*9r?)8EdI*UPc7c(sF Ak^lez diff --git a/msvc/ctsim/ctsim.dsp b/msvc/ctsim/ctsim.dsp index 6d15906..93155e1 100644 --- a/msvc/ctsim/ctsim.dsp +++ b/msvc/ctsim/ctsim.dsp @@ -43,7 +43,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /G6 /MT /W3 /GR /GX /O2 /I "..\..\..\fftw-2.1.3\fftw" /I "\wx2.2.5\include" /I "\wx2.2.5\src\png" /I "\wx2.2.5\src\zlib" /I "..\..\include" /I "..\..\getopt" /I "..\..\..\fftw-2.1.3\rfftw" /D "NDEBUG" /D "__WXWIN__" /D "__WXMSW__" /D "HAVE_SGP" /D "HAVE_PNG" /D "HAVE_WXWINDOWS" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "HAVE_STRING_H" /D "HAVE_FFTW" /D "HAVE_RFFTW" /D "HAVE_GETOPT_H" /D "MSVC" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D CTSIMVERSION=\"3.0.0beta1\" /FR /YX /FD /c +# ADD CPP /nologo /G6 /MT /W3 /GR /GX /O2 /I "..\..\..\fftw-2.1.3\fftw" /I "\wx2.2.5\include" /I "\wx2.2.5\src\png" /I "\wx2.2.5\src\zlib" /I "..\..\include" /I "..\..\getopt" /I "..\..\..\fftw-2.1.3\rfftw" /D "NDEBUG" /D "__WXWIN__" /D "__WXMSW__" /D "HAVE_SGP" /D "HAVE_PNG" /D "HAVE_WXWINDOWS" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "HAVE_STRING_H" /D "HAVE_FFTW" /D "HAVE_RFFTW" /D "HAVE_GETOPT_H" /D "MSVC" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D CTSIMVERSION=\"3.0.1\" /FR /YX /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "NDEBUG" @@ -69,7 +69,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # 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 /G6 /MTd /W3 /Gm /Gi /GR /GX /Zi /Od /Gy /I "\wx2.2.5\include" /I "..\..\..\fftw-2.1.3\fftw" /I "\wx2.2.5\src\png" /I "\wx2.2.5\src\zlib" /I "..\..\include" /I "..\..\getopt" /I "..\..\..\fftw-2.1.3\rfftw" /D VERSION=\"3.0.0beta1\" /D "_DEBUG" /D "__WXMSW__" /D "HAVE_SGP" /D "HAVE_PNG" /D "HAVE_WXWINDOWS" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "HAVE_STRING_H" /D "HAVE_FFTW" /D "HAVE_RFFTW" /D "HAVE_GETOPT_H" /D "MSVC" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D CTSIMVERSION=\"3.0.0beta1\" /FR /YX /FD /GZ /c +# ADD CPP /nologo /G6 /MTd /W3 /Gm /Gi /GR /GX /Zi /Od /Gy /I "\wx2.2.5\include" /I "..\..\..\fftw-2.1.3\fftw" /I "\wx2.2.5\src\png" /I "\wx2.2.5\src\zlib" /I "..\..\include" /I "..\..\getopt" /I "..\..\..\fftw-2.1.3\rfftw" /D VERSION=\"3.0.0beta1\" /D "_DEBUG" /D "__WXMSW__" /D "HAVE_SGP" /D "HAVE_PNG" /D "HAVE_WXWINDOWS" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "HAVE_STRING_H" /D "HAVE_FFTW" /D "HAVE_RFFTW" /D "HAVE_GETOPT_H" /D "MSVC" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D CTSIMVERSION=\"3.0.1\" /FR /YX /FD /GZ /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "_DEBUG" @@ -95,31 +95,36 @@ LINK32=link.exe SOURCE=..\..\src\ctsim.cpp # ADD CPP /D CTSIMVERSION=\"3.0.0alpha5\" -# SUBTRACT CPP /D CTSIMVERSION=\"3.0.0beta1\" # End Source File # Begin Source File SOURCE=..\..\src\dialogs.cpp # ADD CPP /D CTSIMVERSION=\"3.0.0alpha5\" -# SUBTRACT CPP /D CTSIMVERSION=\"3.0.0beta1\" # End Source File # Begin Source File SOURCE=..\..\src\dlgprojections.cpp # ADD CPP /D CTSIMVERSION=\"3.0.0alpha5\" -# SUBTRACT CPP /D CTSIMVERSION=\"3.0.0beta1\" # End Source File # Begin Source File SOURCE=..\..\src\dlgreconstruct.cpp + +!IF "$(CFG)" == "ctsim - Win32 Release" + +# ADD CPP /O1 /D CTSIMVERSION=\"3.0.0alpha5\" + +!ELSEIF "$(CFG)" == "ctsim - Win32 Debug" + # ADD CPP /D CTSIMVERSION=\"3.0.0alpha5\" -# SUBTRACT CPP /D CTSIMVERSION=\"3.0.0beta1\" + +!ENDIF + # End Source File # Begin Source File SOURCE=..\..\src\docs.cpp # ADD CPP /D CTSIMVERSION=\"3.0.0alpha5\" -# SUBTRACT CPP /D CTSIMVERSION=\"3.0.0beta1\" # End Source File # Begin Source File @@ -129,7 +134,6 @@ SOURCE=..\..\src\graph3dview.cpp SOURCE=..\..\src\views.cpp # ADD CPP /D CTSIMVERSION=\"3.0.0alpha5\" -# SUBTRACT CPP /D CTSIMVERSION=\"3.0.0beta1\" # End Source File # End Group # Begin Group "Header Files" @@ -165,6 +169,10 @@ SOURCE=..\..\src\graph3dview.h # End Source File # Begin Source File +SOURCE=..\..\src\splash.xpm +# End Source File +# Begin Source File + SOURCE=..\..\src\views.h # End Source File # End Group @@ -251,6 +259,26 @@ SOURCE=.\wx\msw\warning.ico SOURCE=.\wx\msw\watch1.cur # End Source File +# Begin Source File + +SOURCE=.\wx\html\msw\wbook.ico +# End Source File +# Begin Source File + +SOURCE=.\wx\html\msw\wfolder.ico +# End Source File +# Begin Source File + +SOURCE=.\wx\html\msw\whelp.ico +# End Source File +# Begin Source File + +SOURCE=.\wx\html\msw\whlproot.ico +# End Source File +# Begin Source File + +SOURCE=.\wx\html\msw\wpage.ico +# End Source File # End Group # End Target # End Project diff --git a/msvc/ctsim/ctsim.plg b/msvc/ctsim/ctsim.plg index 687b9af..f0425e3 100644 --- a/msvc/ctsim/ctsim.plg +++ b/msvc/ctsim/ctsim.plg @@ -6,7 +6,8 @@ --------------------Configuration: ctsim - Win32 Release--------------------

Command Lines

-Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP267.tmp" with contents +Creating command line "rc.exe /l 0x409 /fo"Release/ctsim.res" /i "\wx2.2.5\include" /d "NDEBUG" "C:\ctsim\msvc\ctsim\ctsim.rc"" +Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP273.tmp" with contents [ /nologo /G6 /MT /W3 /GR /GX /O2 /I "..\..\..\fftw-2.1.3\fftw" /I "\wx2.2.5\include" /I "\wx2.2.5\src\png" /I "\wx2.2.5\src\zlib" /I "..\..\include" /I "..\..\getopt" /I "..\..\..\fftw-2.1.3\rfftw" /D "NDEBUG" /D "__WXWIN__" /D "__WXMSW__" /D "HAVE_SGP" /D "HAVE_PNG" /D "HAVE_WXWINDOWS" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "HAVE_STRING_H" /D "HAVE_FFTW" /D "HAVE_RFFTW" /D "HAVE_GETOPT_H" /D "MSVC" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D CTSIMVERSION=\"3.0.1\" /D CTSIMVERSION=\"3.0.0alpha5\" /FR"Release/" /Fp"Release/ctsim.pch" /YX /Fo"Release/" /Fd"Release/" /FD /c "C:\ctsim\src\ctsim.cpp" @@ -15,20 +16,20 @@ Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP267.tmp" with conten "C:\ctsim\src\docs.cpp" "C:\ctsim\src\views.cpp" ] -Creating command line "cl.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP267.tmp" -Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP268.tmp" with contents +Creating command line "cl.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP273.tmp" +Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP274.tmp" with contents [ /nologo /G6 /MT /W3 /GR /GX /O1 /I "..\..\..\fftw-2.1.3\fftw" /I "\wx2.2.5\include" /I "\wx2.2.5\src\png" /I "\wx2.2.5\src\zlib" /I "..\..\include" /I "..\..\getopt" /I "..\..\..\fftw-2.1.3\rfftw" /D "NDEBUG" /D "__WXWIN__" /D "__WXMSW__" /D "HAVE_SGP" /D "HAVE_PNG" /D "HAVE_WXWINDOWS" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "HAVE_STRING_H" /D "HAVE_FFTW" /D "HAVE_RFFTW" /D "HAVE_GETOPT_H" /D "MSVC" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D CTSIMVERSION=\"3.0.1\" /D CTSIMVERSION=\"3.0.0alpha5\" /FR"Release/" /Fp"Release/ctsim.pch" /YX /Fo"Release/" /Fd"Release/" /FD /c "C:\ctsim\src\dlgreconstruct.cpp" ] -Creating command line "cl.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP268.tmp" -Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP269.tmp" with contents +Creating command line "cl.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP274.tmp" +Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP275.tmp" with contents [ /nologo /G6 /MT /W3 /GR /GX /O2 /I "..\..\..\fftw-2.1.3\fftw" /I "\wx2.2.5\include" /I "\wx2.2.5\src\png" /I "\wx2.2.5\src\zlib" /I "..\..\include" /I "..\..\getopt" /I "..\..\..\fftw-2.1.3\rfftw" /D "NDEBUG" /D "__WXWIN__" /D "__WXMSW__" /D "HAVE_SGP" /D "HAVE_PNG" /D "HAVE_WXWINDOWS" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "HAVE_STRING_H" /D "HAVE_FFTW" /D "HAVE_RFFTW" /D "HAVE_GETOPT_H" /D "MSVC" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D CTSIMVERSION=\"3.0.1\" /FR"Release/" /Fp"Release/ctsim.pch" /YX /Fo"Release/" /Fd"Release/" /FD /c "C:\ctsim\src\graph3dview.cpp" ] -Creating command line "cl.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP269.tmp" -Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP26A.tmp" with contents +Creating command line "cl.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP275.tmp" +Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP276.tmp" with contents [ wsock32.lib tiff.lib jpeg.lib png.lib zlib.lib xpm.lib comctl32.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 opengl32.lib glu32.lib htmlhelp.lib /nologo /subsystem:windows /incremental:no /pdb:"Release/ctsim.pdb" /machine:I386 /out:"Release/ctsim.exe" /libpath:"\wx2.2.5\lib" .\Release\ctsim.obj @@ -49,8 +50,9 @@ wsock32.lib tiff.lib jpeg.lib png.lib zlib.lib xpm.lib comctl32.lib kernel32.lib \wx2.2.5\lib\zlib.lib \wx2.2.5\lib\tiff.lib ] -Creating command line "link.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP26A.tmp" +Creating command line "link.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP276.tmp"

Output Window

+Compiling resources... Compiling... ctsim.cpp dialogs.cpp diff --git a/msvc/ctsim/logo.ico b/msvc/ctsim/logo.ico index 7ccdc1be5c783026d6b7896ab3f7ebd856b6a909..d5e6f735133c657ddfd74d5bed4f60cba1469dd9 100644 GIT binary patch literal 2238 zcmd5+X;_q16n-f+Q%t$338@igC8*_?h?b#Ns92V03m{e+E|uX@VN@=as4ebkW|}Q3 zmThK*m933_uO;tS)L07@fRK*fRwC` zKu>;eCc=r)L=dR_7YPIcaC_abIh&Ag(qchLF(wrjU}9-0rWO}tVNnsb@q6OT8Mw@5 zxV$bH?MBpF>fv-XBi-!;yk3BQ(AYC?MBf@;V)+965s8^XK96xnQsx;PH8|OmZ$42Ju{Z zRTaE`FT7Ic_hay>Q_yL(T>9bmxlttbZa1d#E@p=rR<{-FmGiu>pIl=jw&dp{K>M*$ z-^5(%t$?0rumJ`_$F<1;CW0Q76{ykHqS4U^r^ks>p6THA(GPhKzs)YdVaLkiLIiw1 ztd%-9W3eVEF9*(@W38w&*a4>(16WrFYi4y>d4~Wd8mTWU16XSq3;=Tna{_%GX09Hu z2X%Hgy2*HzmB8uKKtTauVO%qH4hPoo>}Gj?7vtFJ&*K61>|svK#p}nkvQh-(ovgH} zt_BVq02_*t?7P;gMIE`W@*Xuc0Q&=rg}%)|VIhWdCbr45>??9|fb49ZHL^Y?fLt`8 zv*|EN+Ei2kM~?z^bpU%3ORk>v>c(2LIY3DX!2D-0U!%i_-Ln2RH^4mED6VZ-$6PEf z3)|9!>Et_Envqjg2_4tnr9Ed0XU{Tk4?1$+pGY9~5xG`9oNfn9b`!F=M-yvgb)hG1 zM{_@q*iIA^b|S#pYPL0SEc{63zB79?kabLC|5tGi4zX_y($;NG+>fDc}$4Vw(LSjAipQddiuoo0Bb_w()n zpO@)5IF1b*&3b4p?2)Ao4(9gXO3-DOw`<>_!xbH`?9}<6o`btw)wNrQpoCoAy+_Y$ zF1F|u8g?yu_mQ+BeXk3@zKun2L_h9s=zoFc_r{y#3#H0{$SAoO*oGEj(BNBI=-|*> zNXHgAYZ84O97t$2}rMVp39ah?tf# zy~W_s#~vT4(lcg~ej;_&tl4ws(x4?o?31BSsr=LPgqZz|NKF%|^MzQjP<62A+0Y<` zAM@PvB4&O_dh%jT`U~kIKI28jK=V>WFNJ@3rVvZgG>M5zlf|;7LM&%ADX+Y$x_@m2 zOP<+xQS!>nRjXfb<=<%G-&`)lTbZjv)~sE(zVC)se&Z%Jy|>9P*&Lgc6uTw%ovp3> zyXyV6y_d0F#Ozo3$cA%g7_jcE$zz~5x@K^A@+ZLVBk03 zeuwN};Gp!Dknz1*)gR)1JoMAgzx)dP_InP3x&VJD(c&kJ&qz6ZB=_i_$9k((*~|A0 z*?GrKD185u`30v6i;7i_|IsBf`Cg@ELX@9A^H&95+_q8`$zrCS z^pqKOTE3T;%CHM_NkXUBT}nrHX&GCEh>Fy!v0BWcLNDF}{UREUtD}M-U07JwrT!Qs TRBtdE4Msymq=|3$|3v-<*SqPI literal 4150 zcmc&%ON+3_^&QXcQ7OL`=*?HeiS`uoPCtr5jwKBoLxvT(}StcYap>;#T9Z zGEw8g;DS;41kA|LJ)fSQ>7ME7U-iGMy8f@~dS1Wj>YC~98DL|jy6V<_=bgHB@4NTi zCfY(iz{V96qA)@DrX#aloeEBh=FQ9t?IzR~OE)F+34*lah)K5OkgL_99hQ94j z>Gn}g+pB5&H0@})e6CphQ`6YO|i^Q7Gu04gfGiGIzl~^GieVPzrITSY+R~ZQt{Rde=PjHW5<5NU#eX&L+_$`uL99{%YVKF7QRL)8`)3Y5#y!UEN*(xe!E zPYnOFbV5jmO@$R|)JfN=R3zP2pZo~(tIS{OR`k6e1264&sn()QjuvxNZEk5fhl21T z^CYu?S1jpIzw6Hv%1BIs8(sgP>%SN9L=ZYXcL+}a3}%SgI)X^Lt^ji!9F4)ePRBJ2 zw|jMT-7yRYO0~KaOl84?UuB-{$L~0PG9Tq}5ji+A&!TUN1bnVzx-;eG`_nTgr>4e| z$pf>qI1eQfuO|{8PEU^~lZ&|=JCW<7shbF3)^%6YI(p6g76~ClwDkId=TW=8GnG1Z zSnRc$8Mj;kE(~MX^mC5fxuZ84(JMfU`Vv*sNRR6J@&oacZGSL1i6X72 zIvuaovLo6^SYm$k!T6cC=kv*Y9#qPBA^J5V;{OTcsFaRRjvzN6!DRbnds4t7lo;}R zRezl&L2x>eKvJM=z&R0TT=)oc3p!~ARZJ?h>1Ki^{-LY4>Be1JX-Fl8R@$Rpu`8P` zY8vtg!Hv@@8L4#)7HS*;PD$szz-+54kZ$js@pMzC#A0}i#i=j&u`5C+z9>}^PV`rrct#@D995N(rm~$4TF}KHs;4> zG1NbQfL!rcVW%$5M&~j&C!GV~+BIr4q`Mk5f&)jbALbWlX3FIuW#{vVUo+)8oSv4! zoth%kl#yLoks(ed$#Y2?8Q)#ZXEJ%L|G~=hW}m;i{;?*}89|Bof*i4ikWNd@!1_l? zImY}c^PC7;4ZGPyeytWFwMx;~9bCtc$83h?Q`Bye-lm1LjI6@+_#b9|h50k)Bx;T# z@&x#88@u6}6qsTLSWZXrDH*Z|fTV0tB1_lq(BJ>k-9;*)ZpiwurJ#?A@DlSaG-7MB zsL`;{4Ph%s<&W35uNAqvqD@<^Z-V@8%Z9GaM|~5|I^u%kUlpOXmR3E15SzGah_G`t zn|;(UBI6ax z^8#6=!!V7%0x_GPV19%72WDj4Js!&1!J2H_UeI#B>5}hcMw|Q<^YT5C#$ad?;P9BD zFM7ItsaU%d@_b)+9}+A_dlR{RaAwG%Y1nqflnwQL9ta;AGqh)$&Ougze+1*xVKDY?U~q2WllYWD84UOkEUi+>C>G_Z1YBWo St)?<`a9&^2{bTSyUj74sU2G%( diff --git a/msvc/ctsimtext/ctsimtext.dsp b/msvc/ctsimtext/ctsimtext.dsp index c5e976e..d00745c 100644 --- a/msvc/ctsimtext/ctsimtext.dsp +++ b/msvc/ctsimtext/ctsimtext.dsp @@ -42,7 +42,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /G6 /MT /W3 /GR /GX /O2 /I "\wx2.2.5\src\png" /I "\wx2.2.5\src\zlib" /I "../../include" /I "../../getopt" /I "..\..\..\fftw-2.1.3\fftw" /I "..\..\..\fftw-2.1.3\rfftw" /I "..\..\..\wx2.2.5\include" /D VERSION=\"3.0.0beta1\" /D "NDEBUG" /D "HAVE_GETOPT_H" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "MSVC" /D "HAVE_STRING_H" /D "HAVE_PNG" /D "NO_MAIN" /D "HAVE_WXWINDOWS" /D "__WXMSW__" /YX /FD /c +# ADD CPP /nologo /G6 /MT /W3 /GR /GX /O2 /I "\wx2.2.5\src\png" /I "\wx2.2.5\src\zlib" /I "../../include" /I "../../getopt" /I "..\..\..\fftw-2.1.3\fftw" /I "..\..\..\fftw-2.1.3\rfftw" /I "..\..\..\wx2.2.5\include" /D "NDEBUG" /D VERSION=\"3.0.1\" /D "HAVE_GETOPT_H" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "MSVC" /D "HAVE_STRING_H" /D "HAVE_PNG" /D "NO_MAIN" /D "HAVE_WXWINDOWS" /D "__WXMSW__" /YX /FD /c # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" BSC32=bscmake.exe @@ -66,7 +66,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /G6 /MTd /W3 /Gm /Gi /GR /GX /Zi /Od /Gy /I "\wx2.2.5\src\png" /I "\wx2.2.5\src\zlib" /I "../../include" /I "../../getopt" /I "..\..\..\fftw-2.1.3\fftw" /I "..\..\..\fftw-2.1.3\rfftw" /I "..\..\..\wx2.2.5\include" /D VERSION=\"3.0.0beta1\" /D "_DEBUG" /D "HAVE_GETOPT_H" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "MSVC" /D "HAVE_STRING_H" /D "HAVE_PNG" /D "NO_MAIN" /D "HAVE_WXWINDOWS" /D "__WXMSW__" /FR /YX /FD /GZ /c +# ADD CPP /nologo /G6 /MTd /W3 /Gm /Gi /GR /GX /Zi /Od /Gy /I "\wx2.2.5\src\png" /I "\wx2.2.5\src\zlib" /I "../../include" /I "../../getopt" /I "..\..\..\fftw-2.1.3\fftw" /I "..\..\..\fftw-2.1.3\rfftw" /I "..\..\..\wx2.2.5\include" /D "_DEBUG" /D VERSION=\"3.0.1\" /D "HAVE_GETOPT_H" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "MSVC" /D "HAVE_STRING_H" /D "HAVE_PNG" /D "NO_MAIN" /D "HAVE_WXWINDOWS" /D "__WXMSW__" /FR /YX /FD /GZ /c # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" BSC32=bscmake.exe diff --git a/msvc/ctsimtext/logo.ico b/msvc/ctsimtext/logo.ico index 7ccdc1be5c783026d6b7896ab3f7ebd856b6a909..d5e6f735133c657ddfd74d5bed4f60cba1469dd9 100644 GIT binary patch literal 2238 zcmd5+X;_q16n-f+Q%t$338@igC8*_?h?b#Ns92V03m{e+E|uX@VN@=as4ebkW|}Q3 zmThK*m933_uO;tS)L07@fRK*fRwC` zKu>;eCc=r)L=dR_7YPIcaC_abIh&Ag(qchLF(wrjU}9-0rWO}tVNnsb@q6OT8Mw@5 zxV$bH?MBpF>fv-XBi-!;yk3BQ(AYC?MBf@;V)+965s8^XK96xnQsx;PH8|OmZ$42Ju{Z zRTaE`FT7Ic_hay>Q_yL(T>9bmxlttbZa1d#E@p=rR<{-FmGiu>pIl=jw&dp{K>M*$ z-^5(%t$?0rumJ`_$F<1;CW0Q76{ykHqS4U^r^ks>p6THA(GPhKzs)YdVaLkiLIiw1 ztd%-9W3eVEF9*(@W38w&*a4>(16WrFYi4y>d4~Wd8mTWU16XSq3;=Tna{_%GX09Hu z2X%Hgy2*HzmB8uKKtTauVO%qH4hPoo>}Gj?7vtFJ&*K61>|svK#p}nkvQh-(ovgH} zt_BVq02_*t?7P;gMIE`W@*Xuc0Q&=rg}%)|VIhWdCbr45>??9|fb49ZHL^Y?fLt`8 zv*|EN+Ei2kM~?z^bpU%3ORk>v>c(2LIY3DX!2D-0U!%i_-Ln2RH^4mED6VZ-$6PEf z3)|9!>Et_Envqjg2_4tnr9Ed0XU{Tk4?1$+pGY9~5xG`9oNfn9b`!F=M-yvgb)hG1 zM{_@q*iIA^b|S#pYPL0SEc{63zB79?kabLC|5tGi4zX_y($;NG+>fDc}$4Vw(LSjAipQddiuoo0Bb_w()n zpO@)5IF1b*&3b4p?2)Ao4(9gXO3-DOw`<>_!xbH`?9}<6o`btw)wNrQpoCoAy+_Y$ zF1F|u8g?yu_mQ+BeXk3@zKun2L_h9s=zoFc_r{y#3#H0{$SAoO*oGEj(BNBI=-|*> zNXHgAYZ84O97t$2}rMVp39ah?tf# zy~W_s#~vT4(lcg~ej;_&tl4ws(x4?o?31BSsr=LPgqZz|NKF%|^MzQjP<62A+0Y<` zAM@PvB4&O_dh%jT`U~kIKI28jK=V>WFNJ@3rVvZgG>M5zlf|;7LM&%ADX+Y$x_@m2 zOP<+xQS!>nRjXfb<=<%G-&`)lTbZjv)~sE(zVC)se&Z%Jy|>9P*&Lgc6uTw%ovp3> zyXyV6y_d0F#Ozo3$cA%g7_jcE$zz~5x@K^A@+ZLVBk03 zeuwN};Gp!Dknz1*)gR)1JoMAgzx)dP_InP3x&VJD(c&kJ&qz6ZB=_i_$9k((*~|A0 z*?GrKD185u`30v6i;7i_|IsBf`Cg@ELX@9A^H&95+_q8`$zrCS z^pqKOTE3T;%CHM_NkXUBT}nrHX&GCEh>Fy!v0BWcLNDF}{UREUtD}M-U07JwrT!Qs TRBtdE4Msymq=|3$|3v-<*SqPI literal 4150 zcmc&%ON+3_^&QXcQ7OL`=*?HeiS`uoPCtr5jwKBoLxvT(}StcYap>;#T9Z zGEw8g;DS;41kA|LJ)fSQ>7ME7U-iGMy8f@~dS1Wj>YC~98DL|jy6V<_=bgHB@4NTi zCfY(iz{V96qA)@DrX#aloeEBh=FQ9t?IzR~OE)F+34*lah)K5OkgL_99hQ94j z>Gn}g+pB5&H0@})e6CphQ`6YO|i^Q7Gu04gfGiGIzl~^GieVPzrITSY+R~ZQt{Rde=PjHW5<5NU#eX&L+_$`uL99{%YVKF7QRL)8`)3Y5#y!UEN*(xe!E zPYnOFbV5jmO@$R|)JfN=R3zP2pZo~(tIS{OR`k6e1264&sn()QjuvxNZEk5fhl21T z^CYu?S1jpIzw6Hv%1BIs8(sgP>%SN9L=ZYXcL+}a3}%SgI)X^Lt^ji!9F4)ePRBJ2 zw|jMT-7yRYO0~KaOl84?UuB-{$L~0PG9Tq}5ji+A&!TUN1bnVzx-;eG`_nTgr>4e| z$pf>qI1eQfuO|{8PEU^~lZ&|=JCW<7shbF3)^%6YI(p6g76~ClwDkId=TW=8GnG1Z zSnRc$8Mj;kE(~MX^mC5fxuZ84(JMfU`Vv*sNRR6J@&oacZGSL1i6X72 zIvuaovLo6^SYm$k!T6cC=kv*Y9#qPBA^J5V;{OTcsFaRRjvzN6!DRbnds4t7lo;}R zRezl&L2x>eKvJM=z&R0TT=)oc3p!~ARZJ?h>1Ki^{-LY4>Be1JX-Fl8R@$Rpu`8P` zY8vtg!Hv@@8L4#)7HS*;PD$szz-+54kZ$js@pMzC#A0}i#i=j&u`5C+z9>}^PV`rrct#@D995N(rm~$4TF}KHs;4> zG1NbQfL!rcVW%$5M&~j&C!GV~+BIr4q`Mk5f&)jbALbWlX3FIuW#{vVUo+)8oSv4! zoth%kl#yLoks(ed$#Y2?8Q)#ZXEJ%L|G~=hW}m;i{;?*}89|Bof*i4ikWNd@!1_l? zImY}c^PC7;4ZGPyeytWFwMx;~9bCtc$83h?Q`Bye-lm1LjI6@+_#b9|h50k)Bx;T# z@&x#88@u6}6qsTLSWZXrDH*Z|fTV0tB1_lq(BJ>k-9;*)ZpiwurJ#?A@DlSaG-7MB zsL`;{4Ph%s<&W35uNAqvqD@<^Z-V@8%Z9GaM|~5|I^u%kUlpOXmR3E15SzGah_G`t zn|;(UBI6ax z^8#6=!!V7%0x_GPV19%72WDj4Js!&1!J2H_UeI#B>5}hcMw|Q<^YT5C#$ad?;P9BD zFM7ItsaU%d@_b)+9}+A_dlR{RaAwG%Y1nqflnwQL9ta;AGqh)$&Ougze+1*xVKDY?U~q2WllYWD84UOkEUi+>C>G_Z1YBWo St)?<`a9&^2{bTSyUj74sU2G%( diff --git a/msvc/libctsim/libctsim.dsp b/msvc/libctsim/libctsim.dsp index d981c55..478ef7b 100644 --- a/msvc/libctsim/libctsim.dsp +++ b/msvc/libctsim/libctsim.dsp @@ -123,6 +123,15 @@ SOURCE=..\..\libctgraphics\dlgezplot.cpp # Begin Source File SOURCE=..\..\libctgraphics\ezplot.cpp + +!IF "$(CFG)" == "libctsim - Win32 Release" + +# ADD CPP /O1 + +!ELSEIF "$(CFG)" == "libctsim - Win32 Debug" + +!ENDIF + # End Source File # Begin Source File @@ -195,6 +204,15 @@ SOURCE=..\..\libctsim\projections.cpp # Begin Source File SOURCE=..\..\libctsim\reconstruct.cpp + +!IF "$(CFG)" == "libctsim - Win32 Release" + +# ADD CPP /O1 + +!ELSEIF "$(CFG)" == "libctsim - Win32 Debug" + +!ENDIF + # End Source File # Begin Source File -- 2.34.1