X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=msvc%2Fctsim%2Fctsim.dsp;h=3f1e78647f75dfed0a00e09f8a7d8ef698b60c57;hb=71faaba5bf4be59ef81fff71f2f3403a41c90b0f;hp=c5c3ddf7aea81b491139c4c852332d75f6cdc937;hpb=665706fff2012321fbf024feba0c207eb6f6e005;p=ctsim.git diff --git a/msvc/ctsim/ctsim.dsp b/msvc/ctsim/ctsim.dsp index c5c3ddf..3f1e786 100644 --- a/msvc/ctsim/ctsim.dsp +++ b/msvc/ctsim/ctsim.dsp @@ -53,7 +53,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo 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 wsock32.lib comctl32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libpng.lib zlib.lib /nologo /subsystem:windows /machine:I386 /libpath:"..\..\..\lpng108\msvc\win32\libpng\lib" /libpath:"..\..\..\lpng108\msvc\win32\zlib\lib" +# ADD LINK32 kernel32.lib user32.lib wsock32.lib comctl32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libpng.lib zlib.lib xpm.lib /nologo /subsystem:windows /machine:I386 /libpath:"..\..\..\lpng108\msvc\win32\libpng\lib" /libpath:"..\..\..\lpng108\msvc\win32\zlib\lib" /libpath:"..\..\..\wx2\lib" !ELSEIF "$(CFG)" == "ctsim - Win32 Debug" @@ -79,7 +79,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo 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 comctl32.lib winmm.lib rpcrt4.lib ws2_32.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 ../libctsim/Debug/libctsim.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 ..\..\..\lpng108\msvc\win32\libpng\lib_dbg\libpng.lib ..\..\..\lpng108\msvc\win32\zlib\lib_dbg\zlib.lib libcmtd.lib ..\..\..\fftw-2.1.3\Win32\FFTW2st\Debug\FFTW2st.lib ..\..\..\fftw-2.1.3\Win32\RFFTW2st\Debug\RFFTW2st.lib ../../../wx2/lib/wxd.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrtd.lib" /pdbtype:sept /libpath:"..\..\..\lpng108\msvc\win32\libpng\lib" /libpath:"..\..\..\lpng108\msvc\win32\zlib\lib" +# ADD LINK32 comctl32.lib winmm.lib rpcrt4.lib ws2_32.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 ../libctsim/Debug/libctsim.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 ..\..\..\lpng108\msvc\win32\libpng\lib_dbg\libpng.lib ..\..\..\lpng108\msvc\win32\zlib\lib_dbg\zlib.lib libcmtd.lib ..\..\..\fftw-2.1.3\Win32\FFTW2st\Debug\FFTW2st.lib ..\..\..\fftw-2.1.3\Win32\RFFTW2st\Debug\RFFTW2st.lib ../../../wx2/lib/wxd.lib xpmd.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\lpng108\msvc\win32\libpng\lib" /libpath:"..\..\..\lpng108\msvc\win32\zlib\lib" /libpath:"..\..\..\wx2\lib" # SUBTRACT LINK32 /nodefaultlib !ENDIF @@ -94,26 +94,38 @@ LINK32=link.exe # Begin Source File 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 +# ADD CPP /D CTSIMVERSION=\"3.0.0alpha5\" +# SUBTRACT CPP /D CTSIMVERSION=\"3.0.0beta1\" # 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 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" @@ -153,20 +165,11 @@ SOURCE=.\wx\msw\blank.cur # End Source File # Begin Source File -SOURCE=..\..\..\wx2\include\wx\msw\wx\msw\blank.cur -# End Source File -# Begin Source File - SOURCE=.\wx\msw\bullseye.cur # End Source File # Begin Source File -SOURCE=..\..\..\wx2\include\wx\msw\wx\msw\bullseye.cur -# End Source File -# Begin Source File - SOURCE=.\ctsim.rc -# PROP Exclude_From_Build 1 # End Source File # Begin Source File @@ -174,23 +177,15 @@ SOURCE=.\wx\msw\error.ico # End Source File # Begin Source File -SOURCE=..\..\..\wx2\include\wx\msw\wx\msw\error.ico -# End Source File -# Begin Source File - SOURCE=.\wx\msw\hand.cur # End Source File # Begin Source File -SOURCE=..\..\..\wx2\include\wx\msw\wx\msw\hand.cur -# End Source File -# Begin Source File - SOURCE=.\wx\msw\info.ico # End Source File # Begin Source File -SOURCE=..\..\..\wx2\include\wx\msw\wx\msw\info.ico +SOURCE=.\logo.ico # End Source File # Begin Source File @@ -198,104 +193,52 @@ SOURCE=.\wx\msw\magnif1.cur # End Source File # Begin Source File -SOURCE=..\..\..\wx2\include\wx\msw\wx\msw\magnif1.cur -# End Source File -# Begin Source File - SOURCE=.\wx\msw\noentry.cur # End Source File # Begin Source File -SOURCE=..\..\..\wx2\include\wx\msw\wx\msw\noentry.cur -# End Source File -# Begin Source File - SOURCE=.\wx\msw\pbrush.cur # End Source File # Begin Source File -SOURCE=..\..\..\wx2\include\wx\msw\wx\msw\pbrush.cur -# End Source File -# Begin Source File - SOURCE=.\wx\msw\pencil.cur # End Source File # Begin Source File -SOURCE=..\..\..\wx2\include\wx\msw\wx\msw\pencil.cur -# End Source File -# Begin Source File - SOURCE=.\wx\msw\pntleft.cur # End Source File # Begin Source File -SOURCE=..\..\..\wx2\include\wx\msw\wx\msw\pntleft.cur -# End Source File -# Begin Source File - SOURCE=.\wx\msw\pntright.cur # End Source File # Begin Source File -SOURCE=..\..\..\wx2\include\wx\msw\wx\msw\pntright.cur -# End Source File -# Begin Source File - SOURCE=.\wx\msw\query.cur # End Source File # Begin Source File -SOURCE=..\..\..\wx2\include\wx\msw\wx\msw\query.cur -# End Source File -# Begin Source File - SOURCE=.\wx\msw\question.ico # End Source File # Begin Source File -SOURCE=..\..\..\wx2\include\wx\msw\wx\msw\question.ico -# End Source File -# Begin Source File - SOURCE=.\wx\msw\roller.cur # End Source File # Begin Source File -SOURCE=..\..\..\wx2\include\wx\msw\wx\msw\roller.cur -# End Source File -# Begin Source File - SOURCE=.\wx\msw\size.cur # End Source File # Begin Source File -SOURCE=..\..\..\wx2\include\wx\msw\wx\msw\size.cur -# End Source File -# Begin Source File - SOURCE=.\wx\msw\tip.ico # End Source File # Begin Source File -SOURCE=..\..\..\wx2\include\wx\msw\wx\msw\tip.ico -# End Source File -# Begin Source File - SOURCE=.\wx\msw\warning.ico # End Source File # Begin Source File -SOURCE=..\..\..\wx2\include\wx\msw\wx\msw\warning.ico -# End Source File -# Begin Source File - SOURCE=.\wx\msw\watch1.cur # End Source File -# Begin Source File - -SOURCE=..\..\..\wx2\include\wx\msw\wx\msw\watch1.cur -# End Source File # End Group # End Target # End Project