diff options
| author | Iavor S. Diatchki <iavor.diatchki@gmail.com> | 2012-03-19 20:11:50 -0700 |
|---|---|---|
| committer | Iavor S. Diatchki <iavor.diatchki@gmail.com> | 2012-03-19 20:11:50 -0700 |
| commit | deed56f4473d93a40159ea5422d1840512952f3f (patch) | |
| tree | 1e8363871d12bbf18f4899bae4f5b6e9124278a6 /mk | |
| parent | 62b25ec4d4654151ff36641b23adb7422e36da00 (diff) | |
| parent | d7bd9ee63968f6e4df6b32eff8ff11d866dca794 (diff) | |
| download | haskell-deed56f4473d93a40159ea5422d1840512952f3f.tar.gz | |
Merge remote-tracking branch 'origin/master' into type-nats
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/config.mk.in | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/mk/config.mk.in b/mk/config.mk.in index 2b5bd46aba..2482da869d 100644 --- a/mk/config.mk.in +++ b/mk/config.mk.in @@ -622,6 +622,12 @@ ifeq "$(CrossCompiling)" "YES" SRC_HSC2HS_OPTS += --cross-compile endif +ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32" +WINDRES = $(INPLACE_MINGW)/bin/windres +else ifeq "$(TARGETPLATFORM)" "x86_64-unknown-mingw32" +WINDRES = $(INPLACE_MINGW)/bin/x86_64-w64-mingw32-windres +endif + #----------------------------------------------------------------------------- # Mingwex Library # |