Changeset 53737 in vbox

Timestamp:

Jan 5, 2015 1:22:50 PM (10 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

97516

Message:

Missing files are in place.

Location:

trunk/src/VBox/Devices

Files:

• Graphics/DevVGA-SVGA3d-ogl.cpp (modified) (2 diffs)
• Makefile.kmk (modified) (2 diffs)

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

@@ -833 +833 @@
     AssertCompile(GL_FALSE == 0);
 
-#if 0 // FIXME
     /*
      * Load and resolve imports from the external shared library.
@@ -844 +843 @@
         return rc;
     }
-#endif
 
     /*

trunk/src/VBox/Devices/Makefile.kmk

@@ -256 +256 @@
    VBoxDD_LDFLAGS.win   += /DELAYLOAD:d3d9.dll
   else
-   ifeq (0,1) # FIXME
    VBoxDD_SOURCES       += \
         Graphics/DevVGA-SVGA3d-ogl.cpp \
@@ -269 +268 @@
         $(QUIET)$(RM) -f -- "$@"
         $(VBOX_DEF_2_LAZY_LOAD) --explicit-load-function --library VBoxSVGA3D --output "$@" $(filter %.def, $^)
-   else
-   VBoxDD_SOURCES       += Graphics/DevVGA-SVGA3d-ogl.cpp
-   VBoxDD_LIBS          += $(PATH_STAGE_BIN)/VBoxSVGA3D$(VBOX_SUFF_DLL)
-   endif
    VBoxDD_LIBS.linux    += GL X11
    VBoxDD_LIBS.win      += $(PATH_SDK_$(VBOX_WINPSDK)_LIB)/Opengl32.lib