Changeset 55790 in vbox

Timestamp:

May 9, 2015 11:41:02 PM (9 years ago)

Author:

vboxsync

Message:

Replaced .rc files in src/VBox/Devices.

Location:

trunk/src/VBox/Devices

Files:

• Graphics/DevVGA-SVGA3d-ogl.cpp (modified) (1 diff)
• Graphics/VBoxSVGA3D.rc (deleted)
• Makefile.kmk (modified) (12 diffs)
• build/VBoxDD.rc (deleted)
• build/VBoxDD2.rc (deleted)
• build/VBoxDDU.rc (deleted)

trunk/src/VBox/Devices/Graphics/DevVGA-SVGA3d-ogl.cpp

@@ -2332 +2332 @@
         pSurface->formatGL = GL_DEPTH_COMPONENT;
         pSurface->typeGL = GL_UNSIGNED_SHORT;
-        AssertMsgFailed(("Test me - SVGA3D_Z_D16\n"));
+        //AssertMsgFailed(("Test me - SVGA3D_Z_D16\n"));
         break;
     case SVGA3D_Z_D24S8:                /* D3DFMT_D24S8 - WINED3DFMT_D24_UNORM_S8_UINT */

trunk/src/VBox/Devices/Makefile.kmk

@@ -87 +87 @@
         Storage/VSCSI/VSCSIVpdPagePool.cpp \
         build/VBoxDDUDeps.cpp
- VBoxDDU_SOURCES.win      = \
-        build/VBoxDDU.rc
  ifdef VBOX_WITH_USB
   VBoxDDU_INCS.os2       += \
@@ -111 +109 @@
 
  VBoxDDU_LDFLAGS.linux    = -Wl,--no-undefined
+ $(call VBOX_SET_VER_INFO_DLL,VBoxDDU,VirtualBox VMM Devices and Drivers Utilities)
 
  #
@@ -188 +187 @@
         Network/DrvNetSniffer.cpp \
         Network/Pcap.cpp
- VBoxDD_SOURCES.win       = \
-        build/VBoxDD.rc
  ifn1of ($(KBUILD_TARGET), os2)
   VBoxDD_SOURCES += Storage/DrvHostBase.cpp
@@ -1029 +1026 @@
 
 
+ $(call VBOX_SET_VER_INFO_DLL,VBoxDD,VirtualBox VMM Devices and Drivers) # (last!)
+
+
  #
  # VBoxDD2 (shared object)
@@ -1042 +1042 @@
         PC/DevIoApic.cpp \
         PC/DevLPC.cpp
- VBoxDD2_SOURCES.win     = \
-        build/VBoxDD2.rc
  VBoxDD2_LIBS            = \
         $(PATH_STAGE_LIB)/PcBiosBin$(VBOX_SUFF_LIB) \
@@ -1061 +1059 @@
  endif
 
+ $(call VBOX_SET_VER_INFO_DLL,VBoxDD2,VirtualBox VMM Devices and Drivers 2) # (last!)
 
  #
@@ -1336 +1335 @@
         USB/DevEHCI.cpp \
         USB/DevXHCI.cpp
-  VBoxEhciR3_SOURCES.win = \
-        build/VBoxEhciR3.rc
+  $(call VBOX_SET_VER_INFO_DLL,VBoxEhciR3,PUEL Extension Pack - EHCI Device)
 
   SYSMODS += VBoxEhciR0
@@ -1344 +1342 @@
         USB/DevEHCI.cpp \
         USB/DevXHCI.cpp
+  $(call VBOX_SET_VER_INFO_R0,VBoxEhciR0,PUEL Extension Pack - EHCI Device$(COMMA) ring-0)
 
   ifdef VBOX_WITH_RAW_MODE
@@ -1351 +1350 @@
         USB/DevEHCI.cpp \
         USB/DevXHCI.cpp
+   $(call VBOX_SET_VER_INFO_RC,VBoxEhciRC,PUEL Extension Pack - EHCI Device$(COMMA) raw-mode)
   endif
 
@@ -1366 +1366 @@
   VBoxPciRawR3_TEMPLATE     = VBoxR3ExtPackPuel
   VBoxPciRawR3_SOURCES      = Bus/DevPciRaw.cpp
-  VBoxPciRawR3_SOURCES.win  = build/VBoxPciRawR3.rc
+  $(call VBOX_SET_VER_INFO_DLL,VBoxPciRawR3,PUEL Extension Pack - PCI Passthrough Device)
 
   DLLS += VBoxPciRawDrv
   VBoxPciRawDrv_TEMPLATE    = VBoxR3ExtPackPuel
   VBoxPciRawDrv_SOURCES     = Bus/DrvPciRaw.cpp
-  VBoxPciRawDrv_SOURCES.win = build/VBoxPciRawDrv.rc
+  $(call VBOX_SET_VER_INFO_DLL,VBoxPciRawDrv,PUEL Extension Pack - PCI Passthrough Driver)
 
   SYSMODS += VBoxPciRawR0
   VBoxPciRawR0_TEMPLATE     = VBoxR0ExtPackPuel
   VBoxPciRawR0_SOURCES      = Bus/DevPciRaw.cpp
+  $(call VBOX_SET_VER_INFO_R0,VBoxPciRawR0,PUEL Extension Pack - PCI Passthrough Driver$(COMMA) ring-0)
 
   Bus/DevPciRaw.cpp_INCS    = Bus
@@ -1466 +1467 @@
         Graphics/shaderlib/directx.c \
         Graphics/shaderlib/libWineStub/debug.c
- VBoxSVGA3D_SOURCES.win := \
-        Graphics/VBoxSVGA3D.rc
  VBoxSVGA3D_LIBS        = $(LIB_RUNTIME)
  VBoxSVGA3D_LIBS.win   += $(PATH_SDK_$(VBOX_WINPSDK)_LIB)/Opengl32.lib
@@ -1475 +1474 @@
  VBoxSVGA3D_LDFLAGS.darwin += \
         -install_name $(VBOX_DYLD_EXECUTABLE_PATH)/VBoxSVGA3D.dylib
+ $(call VBOX_SET_VER_INFO_DLL,VBoxSVGA3D,VirtualBox VMSVGA 3D)
 
  #