mirror of
https://github.com/holub/mame
synced 2025-04-28 11:11:48 +03:00
Merge branch 'master' of https://github.com/mamedev/mame
This commit is contained in:
commit
df0645b7d1
@ -650,6 +650,11 @@ ifdef MSVC_BUILD
|
|||||||
else
|
else
|
||||||
ifeq ($(TARGETOS),win32)
|
ifeq ($(TARGETOS),win32)
|
||||||
BGFXINC += -I$(3RDPARTY)/bx/include/compat/mingw
|
BGFXINC += -I$(3RDPARTY)/bx/include/compat/mingw
|
||||||
|
ifeq ($(PTR64),1)
|
||||||
|
BGFXINC += -L$(3RDPARTY)/dxsdk/lib/x64 -D_WIN32_WINNT=0x601
|
||||||
|
else
|
||||||
|
BGFXINC += -L$(3RDPARTY)/dxsdk/lib/x86 -D_WIN32_WINNT=0x601
|
||||||
|
endif
|
||||||
endif
|
endif
|
||||||
ifeq ($(TARGETOS),freebsd)
|
ifeq ($(TARGETOS),freebsd)
|
||||||
BGFXINC += -I$(3RDPARTY)/bx/include/compat/freebsd
|
BGFXINC += -I$(3RDPARTY)/bx/include/compat/freebsd
|
||||||
@ -661,11 +666,6 @@ endif
|
|||||||
|
|
||||||
ifeq ($(TARGETOS),win32)
|
ifeq ($(TARGETOS),win32)
|
||||||
BGFXINC += -I$(3RDPARTY)/dxsdk/Include
|
BGFXINC += -I$(3RDPARTY)/dxsdk/Include
|
||||||
ifeq ($(PTR64),1)
|
|
||||||
BGFXINC += -L$(3RDPARTY)/dxsdk/lib/x64 -D_WIN32_WINNT=0x601
|
|
||||||
else
|
|
||||||
BGFXINC += -L$(3RDPARTY)/dxsdk/lib/x86 -D_WIN32_WINNT=0x601
|
|
||||||
endif
|
|
||||||
endif
|
endif
|
||||||
|
|
||||||
$(LIBOBJ)/bgfx/%.o: $(3RDPARTY)/bgfx/src/%.cpp | $(OSPREBUILD)
|
$(LIBOBJ)/bgfx/%.o: $(3RDPARTY)/bgfx/src/%.cpp | $(OSPREBUILD)
|
||||||
|
Loading…
Reference in New Issue
Block a user