diff options
| author | Andrei Karas <akaras@inbox.ru> | 2017-03-06 22:17:43 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2017-03-06 22:17:43 +0300 |
| commit | ff7be6ae2b79a8b3f0a8b094ec51d7ca3a62a265 (patch) | |
| tree | 9000ce22a5443dc52a8d03067bd4f120e21062d8 | |
| parent | 67447c1b30e85c022e66abfa886bf68f78de4d81 (diff) | |
| download | manaplus-ff7be6ae2b79a8b3f0a8b094ec51d7ca3a62a265.tar.gz manaplus-ff7be6ae2b79a8b3f0a8b094ec51d7ca3a62a265.tar.bz2 manaplus-ff7be6ae2b79a8b3f0a8b094ec51d7ca3a62a265.tar.xz manaplus-ff7be6ae2b79a8b3f0a8b094ec51d7ca3a62a265.zip | |
Add resources into build with mingw and automake.
| -rwxr-xr-x | configure.ac | 12 | ||||
| -rw-r--r-- | src/Makefile.am | 12 |
2 files changed, 22 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 7969baa0d..4df89a250 100755 --- a/configure.ac +++ b/configure.ac @@ -128,10 +128,18 @@ AC_TYPE_INT64_T AC_TYPE_SSIZE_T case $host in - (*mingw*) skip_check_lib="yes" ;; - (*) skip_check_lib="no" + (*mingw*) + skip_check_lib="yes" + mingw=true + ;; + (*) + skip_check_lib="no" + mingw=false + ;; esac +AM_CONDITIONAL(MINGW, test x$mingw = xtrue) + # Search for *-config AC_PATH_PROG(PKG_CONFIG, pkg-config) AC_PATH_PROG(CURL_CONFIG, curl-config) diff --git a/src/Makefile.am b/src/Makefile.am index 7114ab591..2d681a341 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,5 +1,8 @@ AUTOMAKE_OPTIONS = subdir-objects +.rc.o: + ${WINDRES} -o $@ $< + # this need for enable asan in tests #AM_TESTS_ENVIRONMENT = \ # ASAN_OPTIONS=detect_leaks=1 @@ -98,6 +101,11 @@ manaplus_SOURCES = dyecmd_SOURCES = endif +if MINGW +manaplus_SOURCES += manaplus.rc +dyecmd_SOURCES += manaplus.rc +endif + if ENABLE_CILKPLUS dyecmd_CXXFLAGS += -DENABLE_CILKPLUS -fcilkplus -lcilkrts manaplus_CXXFLAGS += -DENABLE_CILKPLUS -fcilkplus -lcilkrts @@ -1956,6 +1964,10 @@ manaplustests_SOURCES = ${SRC} \ utils/dumplibs_unittest.cc \ utils/checkutils_unittest.cc +if MINGW +manaplustests_SOURCES += manaplus.rc +endif + if USE_PHYSFS manaplustests_SOURCES += \ fs/physfs/virtfsphys_unittest.cc |