VirtualBox

Changeset 35332 in vbox


Ignore:
Timestamp:
Dec 24, 2010 9:14:00 PM (14 years ago)
Author:
vboxsync
Message:

wine/xpdm: commpilable 64bit version (not tested yet)

Location:
trunk/src/VBox/Additions/WINNT/Graphics/Wine
Files:
2 added
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Additions/WINNT/Graphics/Wine/Makefile.kmk

    r35319 r35332  
    2020include $(KBUILD_PATH)/subheader.kmk
    2121
     22# @todo: get rid of libwine completely (currently used for xpdm.x86 builds only)
    2223DLLS.x86 += libWine
    2324
    … …  
    115116    libWine/version.c
    116117
    117 DLLS.x86 += wined3d
    118 
     118DLLS += wined3d
     119# @todo: all .amd64 and .x86 stuff below is to get rid of libwine for amd64
     120#        and keep it for .x86 to avoid regressions
     121#        this should be generalized in the future
    119122wined3d_TEMPLATE     = VBOXGUESTR3NPDLL
    120 wined3d_DEFS         = __WINESRC__ WINE_UNICODE_API="" _REENTRANT WINE_NOWINSOCK USE_WIN32_OPENGL __i386__ _USE_MATH_DEFINES\
     123wined3d_DEFS         = __WINESRC__ WINE_UNICODE_API="" _REENTRANT WINE_NOWINSOCK USE_WIN32_OPENGL _USE_MATH_DEFINES\
    121124    DLLDIR=\"\" \
    122125    BINDIR=\"\" \
    … …  
    126129    LIB_TO_DATADIR=\"\" \
    127130    BIN_TO_DATADIR=\"\"
     131wined3d_DEFS.x86     = __i386__
    128132if "$(KBUILD_TYPE)" != "debug" || defined(VBOX_WINE_NO_DEBUG_MSGS)
    129133 wined3d_DEFS        += WINE_NO_DEBUG_MSGS
    130134endif
    131 wined3d_INCS         := $(PATH_SUB_CURRENT)/include
     135wined3d_DEFS.amd64   += VBOX_WINE_WITHOUT_LIBWINE
     136wined3d_INCS.x86     := $(PATH_SUB_CURRENT)/include
     137wined3d_INCS.amd64   := vbox/libWineStub/include
    132138wined3d_SOURCES      := \
    133139    wined3d/arb_program_shader.c \
    … …  
    166172    wined3d/wined3d_main.c \
    167173    wined3d/wined3d.def
    168 wined3d_LIBS = \
     174wined3d_SOURCES.amd64 = vbox/libWineStub/debug.c
     175wined3d_LIBS.x86      = \
    169176    $(PATH_LIB)/libWine$(VBOX_SUFF_LIB)
     177wined3d_SDKS.amd64    = WINDDKWLH
    170178   
    171179ifdef VBOX_WITH_WDDM
    172180DLLS += wined3dwddm
    173 wined3dwddm_EXTENDS  = wined3d
     181wined3dwddm_EXTENDS        = wined3d
    174182if defined(VBOX_SIGNING_MODE) && defined(VBOX_WITH_WDDM)
    175  wined3dwddm_NOINST.win = true
    176 endif
    177 wined3dwddm_INCS     = vbox/libWineStub/include
    178 wined3dwddm_LIBS     = $(NO_SUCH_VARIABLE)
    179 wined3dwddm_DEFS     = $(subst __i386__,,$(wined3d_DEFS)) VBOX_WITH_WDDM VBOX_WINE_WITHOUT_LIBWINE
    180 wined3dwddm_SOURCES  = $(subst wined3d.def,wined3dwddm.def,$(wined3d_SOURCES))
    181 wined3dwddm_SOURCES += vbox/libWineStub/debug.c
    182 wined3dwddm_SDKS     = WINDDKWLH
     183 wined3dwddm_NOINST.win    = true
     184endif
     185wined3dwddm_INCS           = vbox/libWineStub/include
     186wined3dwddm_INCS.x86       = $(NO_SUCH_VARIABLE)
     187wined3dwddm_LIBS.x86       = $(NO_SUCH_VARIABLE)
     188wined3dwddm_DEFS           = $(subst __i386__,,$(wined3d_DEFS)) VBOX_WITH_WDDM VBOX_WINE_WITHOUT_LIBWINE
     189wined3dwddm_DEFS.x86       = $(NO_SUCH_VARIABLE)
     190wined3dwddm_SOURCES        = $(subst wined3d.def,wined3dwddm.def,$(wined3d_SOURCES)) vbox/libWineStub/debug.c
     191wined3dwddm_SOURCES.x86    = $(NO_SUCH_VARIABLE)
     192wined3dwddm_SOURCES.amd64  = $(NO_SUCH_VARIABLE)
     193wined3dwddm_SDKS           = WINDDKWLH
     194wined3dwddm_SDKS.amd64     = $(NO_SUCH_VARIABLE)
    183195
    184196DLLS.amd64 += wined3dwddm-x86
    185 wined3dwddm-x86_EXTENDS = wined3dwddm
     197wined3dwddm-x86_EXTENDS    = wined3dwddm
    186198wined3dwddm-x86_BLD_TRG_ARCH = x86
    187199#wined3dwddm-x86_LIBS = \
    188200        $(VBOX_LIB_IPRT_GUEST_R3_X86) \
    189201        $(VBOX_LIB_VBGL_R3_X86)
    190 wined3dwddm-x86_DEFS = $(wined3dwddm_DEFS) VBOX_WDDM_WOW64
    191 endif
    192 
    193 DLLS.x86 += VBoxD3D8
    194 
     202wined3dwddm-x86_DEFS       = $(wined3dwddm_DEFS) VBOX_WDDM_WOW64
     203endif
     204
     205DLLS += VBoxD3D8
    195206VBoxD3D8_TEMPLATE     = VBOXGUESTR3NPDLL
    196 VBoxD3D8_DEFS         = __WINESRC__ WINE_UNICODE_API="" _REENTRANT WINE_NOWINSOCK USE_WIN32_OPENGL __i386__ _USE_MATH_DEFINES\
     207VBoxD3D8_DEFS         = __WINESRC__ WINE_UNICODE_API="" _REENTRANT WINE_NOWINSOCK USE_WIN32_OPENGL _USE_MATH_DEFINES\
    197208    DLLDIR=\"\" \
    198209    BINDIR=\"\" \
    … …  
    202213    LIB_TO_DATADIR=\"\" \
    203214    BIN_TO_DATADIR=\"\"
     215VBoxD3D8_DEFS.x86 = __i386__
    204216if "$(KBUILD_TYPE)" != "debug" || defined(VBOX_WINE_NO_DEBUG_MSGS)
    205217 VBoxD3D8_DEFS       += WINE_NO_DEBUG_MSGS
    206218endif
    207 #ifdef VBOX_WITH_WDDM
    208 # VBoxD3D8_DEFS        += VBOX_WITH_WDDM IN_VBOXWINEEX
    209 #endif
    210 VBoxD3D8_INCS         := $(PATH_SUB_CURRENT)/include
     219VBoxD3D8_DEFS.amd64   += VBOX_WINE_WITHOUT_LIBWINE
     220VBoxD3D8_INCS.x86     := $(PATH_SUB_CURRENT)/include
     221VBoxD3D8_INCS.amd64   := vbox/libWineStub/include
    211222VBoxD3D8_SOURCES      := \
    212223    d3d8/cubetexture.c \
    … …  
    225236    d3d8/volumetexture.c \
    226237    d3d8/d3d8.def
    227 VBoxD3D8_LIBS = \
    228     $(PATH_LIB)/libWine$(VBOX_SUFF_LIB) \
     238VBoxD3D8_LIBS.x86 = \
     239    $(PATH_LIB)/libWine$(VBOX_SUFF_LIB)
     240VBoxD3D8_LIBS     = \
    229241    $(PATH_LIB)/wined3d$(VBOX_SUFF_LIB)
    230 DLLS.x86 += VBoxD3D9
     242VBoxD3D8_SOURCES.amd64 = vbox/libWineStub/debug.c
     243VBoxD3D8_SDKS.amd64    = WINDDKWLH
     244
     245DLLS += VBoxD3D9
    231246
    232247VBoxD3D9_TEMPLATE     = VBOXGUESTR3NPDLL
    233 VBoxD3D9_DEFS         = __WINESRC__ WINE_UNICODE_API="" _REENTRANT WINE_NOWINSOCK USE_WIN32_OPENGL __i386__ _USE_MATH_DEFINES\
     248VBoxD3D9_DEFS         = __WINESRC__ WINE_UNICODE_API="" _REENTRANT WINE_NOWINSOCK USE_WIN32_OPENGL _USE_MATH_DEFINES\
    234249    DLLDIR=\"\" \
    235250    BINDIR=\"\" \
    … …  
    239254    LIB_TO_DATADIR=\"\" \
    240255    BIN_TO_DATADIR=\"\"
     256VBoxD3D9_DEFS.x86 = __i386__
    241257if "$(KBUILD_TYPE)" != "debug" || defined(VBOX_WINE_NO_DEBUG_MSGS)
    242258 VBoxD3D9_DEFS       += WINE_NO_DEBUG_MSGS
    243259endif
    244 VBoxD3D9_INCS         := $(PATH_SUB_CURRENT)/include
     260VBoxD3D9_DEFS.amd64   += VBOX_WINE_WITHOUT_LIBWINE
     261VBoxD3D9_INCS.x86     := $(PATH_SUB_CURRENT)/include
     262VBoxD3D9_INCS.amd64   := vbox/libWineStub/include
    245263VBoxD3D9_SOURCES      := \
    246264    d3d9/cubetexture.c \
    … …  
    259277    d3d9/vertexshader.c \
    260278    d3d9/volume.c \
    261     d3d9/volumetexture.c \
     279    d3d9/volumetexture.c
     280VBoxD3D9_SOURCES.x86   := \
    262281    d3d9/d3d9.def
    263 VBoxD3D9_LIBS = \
    264     $(PATH_LIB)/libWine$(VBOX_SUFF_LIB) \
     282VBoxD3D9_SOURCES.amd64 := \
     283    d3d9/d3d9xpdm.def
     284VBoxD3D9_LIBS.x86 = \
     285    $(PATH_LIB)/libWine$(VBOX_SUFF_LIB)
     286VBoxD3D9_LIBS     = \
    265287    $(PATH_LIB)/wined3d$(VBOX_SUFF_LIB)
     288VBoxD3D9_SOURCES.amd64 = vbox/libWineStub/debug.c
     289VBoxD3D9_SDKS.amd64    = WINDDKWLH
    266290
    267291ifdef VBOX_WITH_WDDM
    268292DLLS += VBoxD3D9wddm
    269 VBoxD3D9wddm_EXTENDS  = VBoxD3D9
     293VBoxD3D9wddm_EXTENDS        = VBoxD3D9
    270294if defined(VBOX_SIGNING_MODE) && defined(VBOX_WITH_WDDM)
    271295 VBoxD3D9wddm_NOINST.win = true
    272296endif
    273 
    274 VBoxD3D9wddm_INCS     = vbox/libWineStub/include
    275 VBoxD3D9wddm_LIBS     = $(NO_SUCH_VARIABLE)
    276 VBoxD3D9wddm_DEFS += $(subst __i386__,,$(VBoxD3D9_DEFS)) VBOX_WITH_WDDM VBOX_WINE_WITHOUT_LIBWINE IN_VBOXWINEEX
    277 VBoxD3D9wddm_SOURCES  = $(subst d3d9.def,d3d9wddm.def,$(VBoxD3D9_SOURCES))
    278 VBoxD3D9wddm_SOURCES += vbox/libWineStub/debug.c
    279 VBoxD3D9wddm_LIBS = $(PATH_LIB)/wined3dwddm$(VBOX_SUFF_LIB)
    280 VBoxD3D9wddm_SDKS     = WINDDKWLH
     297VBoxD3D9wddm_INCS           = vbox/libWineStub/include
     298VBoxD3D9wddm_INCS.x86       = $(NO_SUCH_VARIABLE)
     299VBoxD3D9wddm_DEFS.x86       = $(NO_SUCH_VARIABLE)
     300VBoxD3D9wddm_DEFS          += $(subst __i386__,,$(VBoxD3D9_DEFS)) VBOX_WITH_WDDM VBOX_WINE_WITHOUT_LIBWINE IN_VBOXWINEEX
     301VBoxD3D9wddm_SOURCES        = $(VBoxD3D9_SOURCES) d3d9/d3d9wddm.def vbox/libWineStub/debug.c
     302VBoxD3D9wddm_SOURCES.x86    = $(NO_SUCH_VARIABLE)
     303VBoxD3D9wddm_SOURCES.amd64  = $(NO_SUCH_VARIABLE)
     304VBoxD3D9wddm_LIBS           = $(PATH_LIB)/wined3dwddm$(VBOX_SUFF_LIB)
     305VBoxD3D9wddm_LIBS.x86       = $(NO_SUCH_VARIABLE)
     306VBoxD3D9wddm_SDKS           = WINDDKWLH
     307VBoxD3D9wddm_SDKS.amd64     = $(NO_SUCH_VARIABLE)
    281308
    282309DLLS.amd64 += VBoxD3D9wddm-x86
    283 VBoxD3D9wddm-x86_EXTENDS = VBoxD3D9wddm
     310VBoxD3D9wddm-x86_EXTENDS      = VBoxD3D9wddm
    284311VBoxD3D9wddm-x86_BLD_TRG_ARCH = x86
    285 VBoxD3D9wddm-x86_LIBS = $(PATH_LIB)/wined3dwddm-x86$(VBOX_SUFF_LIB)
    286 #VBoxD3D9wddm-x86_LIBS += \
    287         $(VBOX_LIB_IPRT_GUEST_R3_X86) \
    288         $(VBOX_LIB_VBGL_R3_X86)
    289 VBoxD3D9wddm-x86_DEFS = $(VBoxD3D9wddm_DEFS) VBOX_WDDM_WOW64
    290 endif
    291 
    292 DLLS.x86 += d3d8
     312VBoxD3D9wddm-x86_LIBS         = $(PATH_LIB)/wined3dwddm-x86$(VBOX_SUFF_LIB)
     313VBoxD3D9wddm-x86_DEFS         = $(VBoxD3D9wddm_DEFS) VBOX_WDDM_WOW64
     314endif
     315
     316DLLS += d3d8
    293317d3d8_TEMPLATE      = VBOXGUESTR3NPDLL
    294 d3d8_DEFS          = __i386__
    295 d3d8_INCS         := $(PATH_SUB_CURRENT)/include
     318d3d8_DEFS.x86      = __i386__
     319d3d8_INCS.x86     := $(PATH_SUB_CURRENT)/include
    296320d3d8_SOURCES       =  \
    297321    switcher/d3d8_main.c \
    … …  
    299323    switcher/sw_d3d8.def \
    300324    switcher/d3d8.rc
    301 
    302 DLLS.x86 += d3d9
     325d3d8_SDKS.amd64    = WINDDKWLH
     326
     327DLLS += d3d9
    303328d3d9_TEMPLATE      = VBOXGUESTR3NPDLL
    304 d3d9_DEFS          = __i386__
    305 d3d9_INCS         := $(PATH_SUB_CURRENT)/include
     329d3d9_DEFS.x86      = __i386__
     330d3d9_INCS.x86     := $(PATH_SUB_CURRENT)/include
    306331d3d9_SOURCES       =  \
    307332    switcher/d3d9_main.c \
    308333    switcher/sw_common.c \
    309     switcher/sw_d3d9.def \
    310334    switcher/d3d9.rc
     335d3d9_SOURCES.x86   =  \
     336    switcher/sw_d3d9.def
     337d3d9_SOURCES.amd64 =  \
     338    switcher/sw_d3d9xpdm.def
     339d3d9_SDKS.amd64    = WINDDKWLH
     340   
    311341
    312342include $(KBUILD_PATH)/subfooter.kmk

  • trunk/src/VBox/Additions/WINNT/Graphics/Wine/d3d8/vertexdeclaration.c

    r33654 r35332  
    8585    return ref_count;
    8686}
     87
     88#ifdef VBOX_WINE_WITHOUT_LIBWINE
     89/* wine defines D3DVSDT_TYPE enumeration while native win headers use D3DVSDT_Xxx defines
     90 * and D3DVSDT_TYPE is not defined.
     91 * Define it here:*/
     92typedef UINT D3DVSDT_TYPE;
     93
     94/* wine defines D3DVSDE_REGISTER enumeration while native win headers use D3DVSDE_Xxx defines
     95 * and D3DVSDE_REGISTER is not defined.
     96 * Define it here:*/
     97typedef UINT D3DVSDE_REGISTER;
     98
     99#endif
    87100
    88101static const char *debug_d3dvsdt_type(D3DVSDT_TYPE d3dvsdt_type)

  • trunk/src/VBox/Additions/WINNT/Graphics/Wine/vbox/libWineStub/include/wine/wined3d.h

    r35052 r35332  
    21422142            float _43;
    21432143            float _44;
    2144         } DUMMYSTRUCTNAME;
     2144        } s;
    21452145        float m[4][4];
    2146     } DUMMYUNIONNAME;
     2146    } u;
    21472147} WINED3DMATRIX;
    21482148typedef struct _WINED3DRECT {
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette