diff options
| author | Tor Lillqvist <tlillqvist@novell.com> | 2011-08-26 20:49:29 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@novell.com> | 2011-08-26 20:54:59 +0300 |
| commit | eefc25d1d2eccf04571b8204663d91e61cb5f7f0 (patch) | |
| tree | d6fe0ed9445a4e059e831742d91f8115fab8663b /canvas/Library_directx5canvas.mk | |
| parent | 933d898b10f0c71fedc882ac2f2adb258d8b5994 (diff) | |
Bin USE_MINGW
Its alternative values as used by OOo is irrelevant to us as we don't
intend to support building using MinGW on Windows itself. To us, MinGW
always means cross-compilation. For us it is enough to look at
$(OS)$(COM), and WNTGCC always implies cross-compilation.
(OOo on the other hand attempts to support use of the Cygwin gcc with
the -mno-cygwin option (which is practically considered an obsolete
option), the normal MinGW compiler (but still from Cygwin), but not
cros-compilation.)
Diffstat (limited to 'canvas/Library_directx5canvas.mk')
| -rw-r--r-- | canvas/Library_directx5canvas.mk | 11 |
1 files changed, 1 insertions, 10 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 |