X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=SimGear.dsp;h=13d638a68836fd40adea54e80916935b87cc9a0b;hb=a1a596b02a3433a7821c418c6e09e76f7bf927b0;hp=d959cd54ca32c46e502d7be2b7d4c1ce26a66fd4;hpb=7eb74c7e2ad9a494360c8adf773aa8b5b17dd968;p=simgear.git diff --git a/SimGear.dsp b/SimGear.dsp index d959cd54..13d638a6 100644 --- a/SimGear.dsp +++ b/SimGear.dsp @@ -789,7 +789,7 @@ SOURCE=.\simgear\misc\exception.cxx # End Source File # Begin Source File -SOURCE=.\simgear\misc\props.cxx +SOURCE=.\simgear\misc\sg_path.cxx !IF "$(CFG)" == "SimGear - Win32 Release" @@ -804,7 +804,7 @@ SOURCE=.\simgear\misc\props.cxx # End Source File # Begin Source File -SOURCE=.\simgear\misc\props_io.cxx +SOURCE=.\simgear\misc\sgstream.cxx !IF "$(CFG)" == "SimGear - Win32 Release" @@ -819,7 +819,7 @@ SOURCE=.\simgear\misc\props_io.cxx # End Source File # Begin Source File -SOURCE=.\simgear\misc\sg_path.cxx +SOURCE=.\simgear\misc\strutils.cxx !IF "$(CFG)" == "SimGear - Win32 Release" @@ -834,7 +834,7 @@ SOURCE=.\simgear\misc\sg_path.cxx # End Source File # Begin Source File -SOURCE=.\simgear\misc\sgstream.cxx +SOURCE=.\simgear\misc\tabbed_values.cxx !IF "$(CFG)" == "SimGear - Win32 Release" @@ -849,7 +849,7 @@ SOURCE=.\simgear\misc\sgstream.cxx # End Source File # Begin Source File -SOURCE=.\simgear\misc\strutils.cxx +SOURCE=.\simgear\misc\texcoord.cxx !IF "$(CFG)" == "SimGear - Win32 Release" @@ -864,7 +864,7 @@ SOURCE=.\simgear\misc\strutils.cxx # End Source File # Begin Source File -SOURCE=.\simgear\misc\texcoord.cxx +SOURCE=.\simgear\misc\zfstream.cxx !IF "$(CFG)" == "SimGear - Win32 Release" @@ -877,220 +877,224 @@ SOURCE=.\simgear\misc\texcoord.cxx !ENDIF # End Source File +# End Group +# Begin Group "Lib_sgprops" + +# PROP Default_Filter "" # Begin Source File -SOURCE=.\simgear\misc\zfstream.cxx +SOURCE=.\simgear\props\condition.cxx !IF "$(CFG)" == "SimGear - Win32 Release" -# PROP Intermediate_Dir "Release\Lib_sgmisc" +# PROP Intermediate_Dir "Release\Lib_sgprops" !ELSEIF "$(CFG)" == "SimGear - Win32 Debug" -# PROP Intermediate_Dir "Debug\Lib_sgmisc" +# PROP Intermediate_Dir "Debug\Lib_sgprops" !ENDIF # End Source File -# End Group -# Begin Group "Lib_sgroute" - -# PROP Default_Filter "" # Begin Source File -SOURCE=.\simgear\route\route.cxx +SOURCE=.\simgear\props\props.cxx !IF "$(CFG)" == "SimGear - Win32 Release" -# PROP Intermediate_Dir "Release\Lib_sgroute" +# PROP Intermediate_Dir "Release\Lib_sgprops" !ELSEIF "$(CFG)" == "SimGear - Win32 Debug" -# PROP Intermediate_Dir "Debug\Lib_sgroute" +# PROP Intermediate_Dir "Debug\Lib_sgprops" !ENDIF # End Source File # Begin Source File -SOURCE=.\simgear\route\waypoint.cxx +SOURCE=.\simgear\props\props_io.cxx !IF "$(CFG)" == "SimGear - Win32 Release" -# PROP Intermediate_Dir "Release\Lib_sgroute" +# PROP Intermediate_Dir "Release\Lib_sgprops" !ELSEIF "$(CFG)" == "SimGear - Win32 Debug" -# PROP Intermediate_Dir "Debug\Lib_sgroute" +# PROP Intermediate_Dir "Debug\Lib_sgprops" !ENDIF # End Source File # End Group -# Begin Group "Lib_sgscreen" +# Begin Group "Lib_sgroute" # PROP Default_Filter "" # Begin Source File -SOURCE=.\simgear\screen\GLBitmaps.cxx +SOURCE=.\simgear\route\route.cxx !IF "$(CFG)" == "SimGear - Win32 Release" -# PROP Intermediate_Dir "Release\Lib_sgscreen" +# PROP Intermediate_Dir "Release\Lib_sgroute" !ELSEIF "$(CFG)" == "SimGear - Win32 Debug" -# PROP Intermediate_Dir "Debug\Lib_sgscreen" +# PROP Intermediate_Dir "Debug\Lib_sgroute" !ENDIF # End Source File # Begin Source File -SOURCE=.\simgear\screen\GLBitmaps.h +SOURCE=.\simgear\route\waypoint.cxx !IF "$(CFG)" == "SimGear - Win32 Release" -# PROP Intermediate_Dir "Release\Lib_sgscreen" +# PROP Intermediate_Dir "Release\Lib_sgroute" !ELSEIF "$(CFG)" == "SimGear - Win32 Debug" -# PROP Intermediate_Dir "Debug\Lib_sgscreen" +# PROP Intermediate_Dir "Debug\Lib_sgroute" !ENDIF # End Source File +# End Group +# Begin Group "Lib_sgmaterial" + +# PROP Default_Filter "" # Begin Source File -SOURCE=.\simgear\screen\screen-dump.cxx +SOURCE=.\simgear\scene\material\mat.cxx !IF "$(CFG)" == "SimGear - Win32 Release" -# PROP Intermediate_Dir "Release\Lib_sgscreen" +# PROP Intermediate_Dir "Release\Lib_sgmaterial" !ELSEIF "$(CFG)" == "SimGear - Win32 Debug" -# PROP Intermediate_Dir "Debug\Lib_sgscreen" +# PROP Intermediate_Dir "Debug\Lib_sgmaterial" !ENDIF # End Source File # Begin Source File -SOURCE=.\simgear\screen\tr.cxx +SOURCE=.\simgear\scene\material\matlib.cxx !IF "$(CFG)" == "SimGear - Win32 Release" -# PROP Intermediate_Dir "Release\Lib_sgscreen" +# PROP Intermediate_Dir "Release\Lib_sgmaterial" !ELSEIF "$(CFG)" == "SimGear - Win32 Debug" -# PROP Intermediate_Dir "Debug\Lib_sgscreen" +# PROP Intermediate_Dir "Debug\Lib_sgmaterial" !ENDIF # End Source File # Begin Source File -SOURCE=.\simgear\screen\win32-printer.h +SOURCE=.\simgear\scene\material\matmodel.cxx !IF "$(CFG)" == "SimGear - Win32 Release" -# PROP Intermediate_Dir "Release\Lib_sgscreen" +# PROP Intermediate_Dir "Release\Lib_sgmaterial" !ELSEIF "$(CFG)" == "SimGear - Win32 Debug" -# PROP Intermediate_Dir "Debug\Lib_sgscreen" +# PROP Intermediate_Dir "Debug\Lib_sgmaterial" !ENDIF # End Source File # End Group -# Begin Group "Lib_sgserial" +# Begin Group "Lib_sgmodel" # PROP Default_Filter "" # Begin Source File -SOURCE=.\simgear\serial\serial.cxx +SOURCE=.\simgear\scene\model\animation.cxx !IF "$(CFG)" == "SimGear - Win32 Release" -# PROP Intermediate_Dir "Release\Lib_sgserial" +# PROP Intermediate_Dir "Release\Lib_sgmodel" !ELSEIF "$(CFG)" == "SimGear - Win32 Debug" -# PROP Intermediate_Dir "Debug\Lib_sgserial" +# PROP Intermediate_Dir "Debug\Lib_sgmodel" !ENDIF # End Source File -# End Group -# Begin Group "Lib_sgsky" - -# PROP Default_Filter "" # Begin Source File -SOURCE=.\simgear\sky\cloud.cxx +SOURCE=.\simgear\scene\model\location.cxx !IF "$(CFG)" == "SimGear - Win32 Release" -# PROP Intermediate_Dir "Release\Lib_sgsky" +# PROP Intermediate_Dir "Release\Lib_sgmodel" !ELSEIF "$(CFG)" == "SimGear - Win32 Debug" -# PROP Intermediate_Dir "Debug\Lib_sgsky" +# PROP Intermediate_Dir "Debug\Lib_sgmodel" !ENDIF # End Source File # Begin Source File -SOURCE=.\simgear\sky\dome.cxx +SOURCE=.\simgear\scene\model\model.cxx !IF "$(CFG)" == "SimGear - Win32 Release" -# PROP Intermediate_Dir "Release\Lib_sgsky" +# PROP Intermediate_Dir "Release\Lib_sgmodel" !ELSEIF "$(CFG)" == "SimGear - Win32 Debug" -# PROP Intermediate_Dir "Debug\Lib_sgsky" +# PROP Intermediate_Dir "Debug\Lib_sgmodel" !ENDIF # End Source File # Begin Source File -SOURCE=.\simgear\sky\moon.cxx +SOURCE=.\simgear\scene\model\modellib.cxx !IF "$(CFG)" == "SimGear - Win32 Release" -# PROP Intermediate_Dir "Release\Lib_sgsky" +# PROP Intermediate_Dir "Release\Lib_sgmodel" !ELSEIF "$(CFG)" == "SimGear - Win32 Debug" -# PROP Intermediate_Dir "Debug\Lib_sgsky" +# PROP Intermediate_Dir "Debug\Lib_sgmodel" !ENDIF # End Source File # Begin Source File -SOURCE=.\simgear\sky\oursun.cxx +SOURCE=.\simgear\scene\model\placement.cxx !IF "$(CFG)" == "SimGear - Win32 Release" -# PROP Intermediate_Dir "Release\Lib_sgsky" +# PROP Intermediate_Dir "Release\Lib_sgmodel" !ELSEIF "$(CFG)" == "SimGear - Win32 Debug" -# PROP Intermediate_Dir "Debug\Lib_sgsky" +# PROP Intermediate_Dir "Debug\Lib_sgmodel" !ENDIF # End Source File +# End Group +# Begin Group "Lib_sgsky" + +# PROP Default_Filter "" # Begin Source File -SOURCE=.\simgear\sky\sky.cxx +SOURCE=.\simgear\scene\sky\cloud.cxx !IF "$(CFG)" == "SimGear - Win32 Release" @@ -1105,7 +1109,7 @@ SOURCE=.\simgear\sky\sky.cxx # End Source File # Begin Source File -SOURCE=.\simgear\sky\sphere.cxx +SOURCE=.\simgear\scene\sky\dome.cxx !IF "$(CFG)" == "SimGear - Win32 Release" @@ -1120,7 +1124,7 @@ SOURCE=.\simgear\sky\sphere.cxx # End Source File # Begin Source File -SOURCE=.\simgear\sky\stars.cxx +SOURCE=.\simgear\scene\sky\moon.cxx !IF "$(CFG)" == "SimGear - Win32 Release" @@ -1133,321 +1137,288 @@ SOURCE=.\simgear\sky\stars.cxx !ENDIF # End Source File -# End Group -# Begin Group "Lib_sgclouds3d" - -# PROP Default_Filter "" # Begin Source File -SOURCE=.\simgear\sky\clouds3d\vec3fv.cpp +SOURCE=.\simgear\scene\sky\oursun.cxx !IF "$(CFG)" == "SimGear - Win32 Release" -# PROP Intermediate_Dir "Release\Lib_sgclouds3d" +# PROP Intermediate_Dir "Release\Lib_sgsky" !ELSEIF "$(CFG)" == "SimGear - Win32 Debug" -# PROP Intermediate_Dir "Debug\Lib_sgclouds3d" +# PROP Intermediate_Dir "Debug\Lib_sgsky" !ENDIF # End Source File # Begin Source File -SOURCE=.\simgear\sky\clouds3d\mat16fv.cpp +SOURCE=.\simgear\scene\sky\sky.cxx !IF "$(CFG)" == "SimGear - Win32 Release" -# PROP Intermediate_Dir "Release\Lib_sgclouds3d" +# PROP Intermediate_Dir "Release\Lib_sgsky" !ELSEIF "$(CFG)" == "SimGear - Win32 Debug" -# PROP Intermediate_Dir "Debug\Lib_sgclouds3d" +# PROP Intermediate_Dir "Debug\Lib_sgsky" !ENDIF # End Source File # Begin Source File -SOURCE=.\simgear\sky\clouds3d\tri.cpp +SOURCE=.\simgear\scene\sky\sphere.cxx !IF "$(CFG)" == "SimGear - Win32 Release" -# PROP Intermediate_Dir "Release\Lib_sgclouds3d" +# PROP Intermediate_Dir "Release\Lib_sgsky" !ELSEIF "$(CFG)" == "SimGear - Win32 Debug" -# PROP Intermediate_Dir "Debug\Lib_sgclouds3d" +# PROP Intermediate_Dir "Debug\Lib_sgsky" !ENDIF # End Source File # Begin Source File -SOURCE=.\simgear\sky\clouds3d\plane.cpp +SOURCE=.\simgear\scene\sky\stars.cxx !IF "$(CFG)" == "SimGear - Win32 Release" -# PROP Intermediate_Dir "Release\Lib_sgclouds3d" +# PROP Intermediate_Dir "Release\Lib_sgsky" !ELSEIF "$(CFG)" == "SimGear - Win32 Debug" -# PROP Intermediate_Dir "Debug\Lib_sgclouds3d" +# PROP Intermediate_Dir "Debug\Lib_sgsky" !ENDIF # End Source File -# Begin Source File - -SOURCE=.\simgear\sky\clouds3d\camera.cpp - -!IF "$(CFG)" == "SimGear - Win32 Release" - -# PROP Intermediate_Dir "Release\Lib_sgclouds3d" - -!ELSEIF "$(CFG)" == "SimGear - Win32 Debug" - -# PROP Intermediate_Dir "Debug\Lib_sgclouds3d" - -!ENDIF +# End Group +# Begin Group "Lib_sgtgdb" -# End Source File +# PROP Default_Filter "" # Begin Source File -SOURCE=.\simgear\sky\clouds3d\camutils.cpp +SOURCE=.\simgear\scene\tgdb\apt_signs.cxx !IF "$(CFG)" == "SimGear - Win32 Release" -# PROP Intermediate_Dir "Release\Lib_sgclouds3d" +# PROP Intermediate_Dir "Release\Lib_sgtgdb" !ELSEIF "$(CFG)" == "SimGear - Win32 Debug" -# PROP Intermediate_Dir "Debug\Lib_sgclouds3d" +# PROP Intermediate_Dir "Debug\Lib_sgtgdb" !ENDIF # End Source File # Begin Source File -SOURCE=.\simgear\sky\clouds3d\minmaxbox.cpp +SOURCE=.\simgear\scene\tgdb\leaf.cxx !IF "$(CFG)" == "SimGear - Win32 Release" -# PROP Intermediate_Dir "Release\Lib_sgclouds3d" +# PROP Intermediate_Dir "Release\Lib_sgtgdb" !ELSEIF "$(CFG)" == "SimGear - Win32 Debug" -# PROP Intermediate_Dir "Debug\Lib_sgclouds3d" +# PROP Intermediate_Dir "Debug\Lib_sgtgdb" !ENDIF # End Source File # Begin Source File -SOURCE=.\simgear\sky\clouds3d\SkyMinMaxBox.cpp +SOURCE=.\simgear\scene\tgdb\obj.cxx !IF "$(CFG)" == "SimGear - Win32 Release" -# PROP Intermediate_Dir "Release\Lib_sgclouds3d" +# PROP Intermediate_Dir "Release\Lib_sgtgdb" !ELSEIF "$(CFG)" == "SimGear - Win32 Debug" -# PROP Intermediate_Dir "Debug\Lib_sgclouds3d" +# PROP Intermediate_Dir "Debug\Lib_sgtgdb" !ENDIF # End Source File # Begin Source File -SOURCE=.\simgear\sky\clouds3d\SkyLight.cpp +SOURCE=.\simgear\scene\tgdb\pt_lights.cxx !IF "$(CFG)" == "SimGear - Win32 Release" -# PROP Intermediate_Dir "Release\Lib_sgclouds3d" +# PROP Intermediate_Dir "Release\Lib_sgtgdb" !ELSEIF "$(CFG)" == "SimGear - Win32 Debug" -# PROP Intermediate_Dir "Debug\Lib_sgclouds3d" +# PROP Intermediate_Dir "Debug\Lib_sgtgdb" !ENDIF # End Source File # Begin Source File -SOURCE=.\simgear\sky\clouds3d\SkyMaterial.cpp +SOURCE=.\simgear\scene\tgdb\userdata.cxx !IF "$(CFG)" == "SimGear - Win32 Release" -# PROP Intermediate_Dir "Release\Lib_sgclouds3d" +# PROP Intermediate_Dir "Release\Lib_sgtgdb" !ELSEIF "$(CFG)" == "SimGear - Win32 Debug" -# PROP Intermediate_Dir "Debug\Lib_sgclouds3d" +# PROP Intermediate_Dir "Debug\Lib_sgtgdb" !ENDIF # End Source File -# Begin Source File - -SOURCE=.\simgear\sky\clouds3d\SkyTextureManager.cpp - -!IF "$(CFG)" == "SimGear - Win32 Release" - -# PROP Intermediate_Dir "Release\Lib_sgclouds3d" - -!ELSEIF "$(CFG)" == "SimGear - Win32 Debug" - -# PROP Intermediate_Dir "Debug\Lib_sgclouds3d" - -!ENDIF +# End Group +# Begin Group "Lib_sgscreen" -# End Source File +# PROP Default_Filter "" # Begin Source File -SOURCE=.\simgear\sky\clouds3d\SkyTextureState.cpp +SOURCE=.\simgear\screen\texture.cxx !IF "$(CFG)" == "SimGear - Win32 Release" -# PROP Intermediate_Dir "Release\Lib_sgclouds3d" +# PROP Intermediate_Dir "Release\Lib_sgscreen" !ELSEIF "$(CFG)" == "SimGear - Win32 Debug" -# PROP Intermediate_Dir "Debug\Lib_sgclouds3d" +# PROP Intermediate_Dir "Debug\Lib_sgscreen" !ENDIF # End Source File # Begin Source File -SOURCE=.\simgear\sky\clouds3d\SkyDynamicTextureManager.cpp +SOURCE=.\simgear\screen\GLBitmaps.cxx !IF "$(CFG)" == "SimGear - Win32 Release" -# PROP Intermediate_Dir "Release\Lib_sgclouds3d" +# PROP Intermediate_Dir "Release\Lib_sgscreen" !ELSEIF "$(CFG)" == "SimGear - Win32 Debug" -# PROP Intermediate_Dir "Debug\Lib_sgclouds3d" +# PROP Intermediate_Dir "Debug\Lib_sgscreen" !ENDIF # End Source File # Begin Source File -SOURCE=.\simgear\sky\clouds3d\SkyRenderableInstanceCloud.cpp +SOURCE=.\simgear\screen\GLBitmaps.h !IF "$(CFG)" == "SimGear - Win32 Release" -# PROP Intermediate_Dir "Release\Lib_sgclouds3d" +# PROP Intermediate_Dir "Release\Lib_sgscreen" !ELSEIF "$(CFG)" == "SimGear - Win32 Debug" -# PROP Intermediate_Dir "Debug\Lib_sgclouds3d" +# PROP Intermediate_Dir "Debug\Lib_sgscreen" !ENDIF # End Source File # Begin Source File -SOURCE=.\simgear\sky\clouds3d\SkyRenderableInstanceGroup.cpp +SOURCE=.\simgear\screen\screen-dump.cxx !IF "$(CFG)" == "SimGear - Win32 Release" -# PROP Intermediate_Dir "Release\Lib_sgclouds3d" +# PROP Intermediate_Dir "Release\Lib_sgscreen" !ELSEIF "$(CFG)" == "SimGear - Win32 Debug" -# PROP Intermediate_Dir "Debug\Lib_sgclouds3d" +# PROP Intermediate_Dir "Debug\Lib_sgscreen" !ENDIF # End Source File # Begin Source File -SOURCE=.\simgear\sky\clouds3d\SkyCloud.cpp +SOURCE=.\simgear\screen\tr.cxx !IF "$(CFG)" == "SimGear - Win32 Release" -# PROP Intermediate_Dir "Release\Lib_sgclouds3d" +# PROP Intermediate_Dir "Release\Lib_sgscreen" !ELSEIF "$(CFG)" == "SimGear - Win32 Debug" -# PROP Intermediate_Dir "Debug\Lib_sgclouds3d" +# PROP Intermediate_Dir "Debug\Lib_sgscreen" !ENDIF # End Source File # Begin Source File -SOURCE=.\simgear\sky\clouds3d\SkyArchive.cpp +SOURCE=.\simgear\screen\win32-printer.h !IF "$(CFG)" == "SimGear - Win32 Release" -# PROP Intermediate_Dir "Release\Lib_sgclouds3d" +# PROP Intermediate_Dir "Release\Lib_sgscreen" !ELSEIF "$(CFG)" == "SimGear - Win32 Debug" -# PROP Intermediate_Dir "Debug\Lib_sgclouds3d" +# PROP Intermediate_Dir "Debug\Lib_sgscreen" !ENDIF # End Source File -# Begin Source File - -SOURCE=.\simgear\sky\clouds3d\SkyUtil.cpp - -!IF "$(CFG)" == "SimGear - Win32 Release" - -# PROP Intermediate_Dir "Release\Lib_sgclouds3d" - -!ELSEIF "$(CFG)" == "SimGear - Win32 Debug" - -# PROP Intermediate_Dir "Debug\Lib_sgclouds3d" - -!ENDIF +# End Group +# Begin Group "Lib_sgserial" -# End Source File +# PROP Default_Filter "" # Begin Source File -SOURCE=.\simgear\sky\clouds3d\SkyContext.cpp +SOURCE=.\simgear\serial\serial.cxx !IF "$(CFG)" == "SimGear - Win32 Release" -# PROP Intermediate_Dir "Release\Lib_sgclouds3d" +# PROP Intermediate_Dir "Release\Lib_sgserial" !ELSEIF "$(CFG)" == "SimGear - Win32 Debug" -# PROP Intermediate_Dir "Debug\Lib_sgclouds3d" +# PROP Intermediate_Dir "Debug\Lib_sgserial" !ENDIF # End Source File +# End Group +# Begin Group "Lib_sgsound" + +# PROP Default_Filter "" # Begin Source File -SOURCE=.\simgear\sky\clouds3d\SkySceneManager.cpp +SOURCE=.\simgear\sound\sound.cxx !IF "$(CFG)" == "SimGear - Win32 Release" -# PROP Intermediate_Dir "Release\Lib_sgclouds3d" +# PROP Intermediate_Dir "Release\Lib_sgsound" !ELSEIF "$(CFG)" == "SimGear - Win32 Debug" -# PROP Intermediate_Dir "Debug\Lib_sgclouds3d" +# PROP Intermediate_Dir "Debug\Lib_sgsound" !ENDIF # End Source File # Begin Source File -SOURCE=.\simgear\sky\clouds3d\SkySceneLoader.cpp +SOURCE=.\simgear\sound\soundmgr.cxx !IF "$(CFG)" == "SimGear - Win32 Release" -# PROP Intermediate_Dir "Release\Lib_sgclouds3d" +# PROP Intermediate_Dir "Release\Lib_sgsound" !ELSEIF "$(CFG)" == "SimGear - Win32 Debug" -# PROP Intermediate_Dir "Debug\Lib_sgclouds3d" +# PROP Intermediate_Dir "Debug\Lib_sgsound" !ENDIF