diff options
Diffstat (limited to 'canvas')
| -rw-r--r-- | canvas/Library_directx5canvas.mk | 11 | ||||
| -rw-r--r-- | canvas/Library_directx9canvas.mk | 9 |
2 files changed, 1 insertions, 19 deletions
diff --git a/canvas/Library_directx5canvas.mk b/canvas/Library_directx5canvas.mk index a24a6688bb91..028f01724589 100644 --- a/canvas/Library_directx5canvas.mk +++ b/canvas/Library_directx5canvas.mk @@ -62,20 +62,11 @@ $(eval $(call gb_Library_add_linked_libs,directx5canvas,\ ifeq ($(OS),WNT) $(eval $(call gb_Library_add_linked_libs,directx5canvas,\ - user32 \ + d3dx \ gdi32 \ gdiplus \ ddraw \ )) -ifneq ($(USE_MINGW),) -$(eval $(call gb_Library_add_linked_libs,directx5canvas,\ -what is $(DIRECTXSDK_LIB)/d3dx.lib now? \ -)) -else -$(eval $(call gb_Library_add_linked_libs,directx5canvas,\ - d3dx \ -)) -endif endif $(WORKDIR)/CustomTarget/canvas/source/directx/%.cxx : $(SRCDIR)/canvas/source/directx/%.cxx diff --git a/canvas/Library_directx9canvas.mk b/canvas/Library_directx9canvas.mk index 4eb035d3078d..733eaf1db6cb 100644 --- a/canvas/Library_directx9canvas.mk +++ b/canvas/Library_directx9canvas.mk @@ -67,15 +67,6 @@ $(eval $(call gb_Library_add_linked_libs,directx9canvas,\ gdi32 \ gdiplus \ )) -ifneq ($(USE_MINGW),) -$(eval $(call gb_Library_add_linked_libs,directx9canvas,\ -what is $(DIRECTXSDK_LIB)/d3d9.lib now? \ -)) -else -$(eval $(call gb_Library_add_linked_libs,directx9canvas,\ - d3d9 \ -)) -endif endif $(eval $(call gb_Library_add_exception_objects,directx9canvas,\ |