Simplify includes

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8bcfaf7ea23e4e20665dcb7c956d4daef8a0a3e3..ce06137119b07994948715564026318d32c704da 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1067,6 +1067,10 @@ else()
     set(ZLIB_INSTALL_LIBRARIES zlib)
 endif()
 
+include_directories(${CMAKE_CURRENT_SOURCE_DIR})
+include_directories(${ARCHDIR})
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/arch/generic)
+
 foreach(ZLIB_INSTALL_LIBRARY ${ZLIB_INSTALL_LIBRARIES})
     if(NOT ZLIB_COMPAT)
         target_compile_definitions(${ZLIB_INSTALL_LIBRARY} PUBLIC ZLIBNG_NATIVE_API)

diff --git a/arch/arm/adler32_neon.c b/arch/arm/adler32_neon.c
index f1c43ff0474973cadbdb3bc9c6e5126b67a7013d..8e46b380170b896f4ddb7acbc4a5976f875a8c39 100644 (file)
--- a/arch/arm/adler32_neon.c
+++ b/arch/arm/adler32_neon.c
@@ -7,8 +7,8 @@
  */
 #ifdef ARM_NEON
 #include "neon_intrins.h"
-#include "../../zbuild.h"
-#include "../../adler32_p.h"
+#include "zbuild.h"
+#include "adler32_p.h"
 
 static void NEON_accum32(uint32_t *s, const uint8_t *buf, size_t len) {
     static const uint16_t ALIGNED_(16) taps[64] = {

diff --git a/arch/arm/arm_features.c b/arch/arm/arm_features.c
index a0e070ba956115d6c905558a2fc73d92fb65276d..247ed027dd8786c8517ea72681612da3de3d0748 100644 (file)
--- a/arch/arm/arm_features.c
+++ b/arch/arm/arm_features.c
@@ -1,4 +1,4 @@
-#include "../../zbuild.h"
+#include "zbuild.h"
 #include "arm_features.h"
 
 #if defined(__linux__) && defined(HAVE_SYS_AUXV_H)

diff --git a/arch/arm/chunkset_neon.c b/arch/arm/chunkset_neon.c
index f9a444b0681fc02a832fd3399a6cc1be37c77533..030f7be7b2196fcd302647fe28c1b28699dadb78 100644 (file)
--- a/arch/arm/chunkset_neon.c
+++ b/arch/arm/chunkset_neon.c
@@ -4,8 +4,8 @@
 
 #ifdef ARM_NEON
 #include "neon_intrins.h"
-#include "../../zbuild.h"
-#include "../generic/chunk_permute_table.h"
+#include "zbuild.h"
+#include "chunk_permute_table.h"
 
 typedef uint8x16_t chunk_t;
 

diff --git a/arch/arm/compare256_neon.c b/arch/arm/compare256_neon.c
index 7daeba411ecea7d0c3fbee707ac7c57a5acb2b2c..4d6ba5334b8767e6c2df70f640fc8d1f48e97758 100644 (file)
--- a/arch/arm/compare256_neon.c
+++ b/arch/arm/compare256_neon.c
@@ -3,7 +3,7 @@
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
-#include "../../zbuild.h"
+#include "zbuild.h"
 
 #include "fallback_builtins.h"
 

diff --git a/arch/arm/crc32_acle.c b/arch/arm/crc32_acle.c
index ac7d6ff66b3ea703b889958e4b93ebe7296606bb..116bcab1c23f114e5dfa2d637c8457dadf3f0526 100644 (file)
--- a/arch/arm/crc32_acle.c
+++ b/arch/arm/crc32_acle.c
@@ -7,7 +7,7 @@
 
 #ifdef ARM_ACLE
 #include "acle_intrins.h"
-#include "../../zbuild.h"
+#include "zbuild.h"
 
 Z_INTERNAL Z_TARGET_CRC uint32_t crc32_acle(uint32_t crc, const uint8_t *buf, size_t len) {
     Z_REGISTER uint32_t c;

diff --git a/arch/arm/insert_string_acle.c b/arch/arm/insert_string_acle.c
index aa8385c712e614793bfa17a06a31bdf8841010c1..b357f8abcd17c3367aac103ca8bcd53269a8e1d4 100644 (file)
--- a/arch/arm/insert_string_acle.c
+++ b/arch/arm/insert_string_acle.c
@@ -7,8 +7,8 @@
 
 #ifdef ARM_ACLE
 #include "acle_intrins.h"
-#include "../../zbuild.h"
-#include "../../deflate.h"
+#include "zbuild.h"
+#include "deflate.h"
 
 #define HASH_CALC(s, h, val) \
     h = __crc32w(0, val)
@@ -20,5 +20,5 @@
 #define INSERT_STRING       Z_TARGET_CRC insert_string_acle
 #define QUICK_INSERT_STRING Z_TARGET_CRC quick_insert_string_acle
 
-#include "../../insert_string_tpl.h"
+#include "insert_string_tpl.h"
 #endif

diff --git a/arch/arm/slide_hash_armv6.c b/arch/arm/slide_hash_armv6.c
index 0a2eeccf92692a97f6d11e9a988e5759f7247a69..07f71b59eb822a8720dc3de9f3d49e4308b22907 100644 (file)
--- a/arch/arm/slide_hash_armv6.c
+++ b/arch/arm/slide_hash_armv6.c
@@ -5,8 +5,8 @@
 
 #if defined(ARM_SIMD)
 #include "acle_intrins.h"
-#include "../../zbuild.h"
-#include "../../deflate.h"
+#include "zbuild.h"
+#include "deflate.h"
 
 /* SIMD version of hash_chain rebase */
 static inline void slide_hash_chain(Pos *table, uint32_t entries, uint16_t wsize) {

diff --git a/arch/arm/slide_hash_neon.c b/arch/arm/slide_hash_neon.c
index a96ca11799b5a82cfdfffaf396aa5eb0ceaec277..a601e6099ad7cc4394950c0ef09656f2d9e47b36 100644 (file)
--- a/arch/arm/slide_hash_neon.c
+++ b/arch/arm/slide_hash_neon.c
@@ -10,8 +10,8 @@
 
 #ifdef ARM_NEON
 #include "neon_intrins.h"
-#include "../../zbuild.h"
-#include "../../deflate.h"
+#include "zbuild.h"
+#include "deflate.h"
 
 /* SIMD version of hash_chain rebase */
 static inline void slide_hash_chain(Pos *table, uint32_t entries, uint16_t wsize) {

diff --git a/arch/power/chunkset_power8.c b/arch/power/chunkset_power8.c
index 7cbb8029b3b141834e05b69a579060f5e2813bdf..aef19732736f57eeab01ba4141a6d1eef896b54b 100644 (file)
--- a/arch/power/chunkset_power8.c
+++ b/arch/power/chunkset_power8.c
@@ -4,7 +4,7 @@
 
 #ifdef POWER8_VSX
 #include <altivec.h>
-#include "../../zbuild.h"
+#include "zbuild.h"
 
 typedef vector unsigned char chunk_t;
 

diff --git a/arch/power/compare256_power9.c b/arch/power/compare256_power9.c
index 9b0ddaf80045019126cdba4a12e608ad521bddbf..f936cc9829f4287beee08c1ad201b812601b16cc 100644 (file)
--- a/arch/power/compare256_power9.c
+++ b/arch/power/compare256_power9.c
@@ -5,8 +5,8 @@
 
 #ifdef POWER9
 #include <altivec.h>
-#include "../../zbuild.h"
-#include "../../zendian.h"
+#include "zbuild.h"
+#include "zendian.h"
 
 /* Older versions of GCC misimplemented semantics for these bit counting builtins.
  * https://gcc.gnu.org/git/gitweb.cgi?p=gcc.git;h=3f30f2d1dbb3228b8468b26239fe60c2974ce2ac */

diff --git a/arch/power/power_features.c b/arch/power/power_features.c
index f73503734b13d562d6e6805f307b7dcb586420ca..3514517723ff62dc5034ff70be4869ed18c5d6d0 100644 (file)
--- a/arch/power/power_features.c
+++ b/arch/power/power_features.c
@@ -10,7 +10,7 @@
 #ifdef __FreeBSD__
 #  include <machine/cpu.h>
 #endif
-#include "../../zbuild.h"
+#include "zbuild.h"
 #include "power_features.h"
 
 void Z_INTERNAL power_check_features(struct power_cpu_features *features) {

diff --git a/arch/riscv/adler32_rvv.c b/arch/riscv/adler32_rvv.c
index da46f37e73c18c40283f9659cea9b5f828e7afa1..d0f9aaa567b3815408284e16cf2dd6b765768ef2 100644 (file)
--- a/arch/riscv/adler32_rvv.c
+++ b/arch/riscv/adler32_rvv.c
@@ -9,8 +9,8 @@
 #include <riscv_vector.h>
 #include <stdint.h>
 
-#include "../../zbuild.h"
-#include "../../adler32_p.h"
+#include "zbuild.h"
+#include "adler32_p.h"
 
 static inline uint32_t adler32_rvv_impl(uint32_t adler, uint8_t* restrict dst, const uint8_t *src, size_t len, int COPY) {
     /* split Adler-32 into component sums */

diff --git a/arch/riscv/compare256_rvv.c b/arch/riscv/compare256_rvv.c
index 0fd6082c44d0ab91bd61704a60c397bea0a9fc90..cf0de0deb776282ad56ab4fb454bb95477abddad 100644 (file)
--- a/arch/riscv/compare256_rvv.c
+++ b/arch/riscv/compare256_rvv.c
@@ -6,7 +6,7 @@
 
 #ifdef RISCV_RVV
 
-#include "../../zbuild.h"
+#include "zbuild.h"
 #include "fallback_builtins.h"
 
 #include <riscv_vector.h>

diff --git a/arch/riscv/riscv_features.c b/arch/riscv/riscv_features.c
index b066f427e0fc3e8bffbe7747b0f910e72c265f5e..506b480c1188be53bcc444ab0d8ffbb2353452a4 100644 (file)
--- a/arch/riscv/riscv_features.c
+++ b/arch/riscv/riscv_features.c
@@ -4,7 +4,7 @@
 #include <sys/auxv.h>
 #include <sys/utsname.h>
 
-#include "../../zbuild.h"
+#include "zbuild.h"
 #include "riscv_features.h"
 
 #define ISA_V_HWCAP (1 << ('v' - 'a'))

diff --git a/arch/riscv/slide_hash_rvv.c b/arch/riscv/slide_hash_rvv.c
index 1164e89ba250f0f9dcd77787ff1f1744af5c97b7..d8fa46264ab5fab5341632ec6395c60bee5736e1 100644 (file)
--- a/arch/riscv/slide_hash_rvv.c
+++ b/arch/riscv/slide_hash_rvv.c
@@ -8,8 +8,8 @@
 
 #include <riscv_vector.h>
 
-#include "../../zbuild.h"
-#include "../../deflate.h"
+#include "zbuild.h"
+#include "deflate.h"
 
 static inline void slide_hash_chain(Pos *table, uint32_t entries, uint16_t wsize) {
     size_t vl;

diff --git a/arch/s390/crc32-vx.c b/arch/s390/crc32-vx.c
index acfa21887e975b1e32cce97fd4a9fc25b4a3b528..82b8532e5a939573271199a2422067550be53bbe 100644 (file)
--- a/arch/s390/crc32-vx.c
+++ b/arch/s390/crc32-vx.c
@@ -12,7 +12,7 @@
  * relicensed under the zlib license.
  */
 
-#include "../../zbuild.h"
+#include "zbuild.h"
 #include "crc32_braid_p.h"
 
 #include <vecintrin.h>

diff --git a/arch/s390/dfltcc_detail.h b/arch/s390/dfltcc_detail.h
index 362d94c337fd83e0f5ce9c531afa9bf25b2491ab..49779d60c5b34a54ac8c05e163e73fbd2f371387 100644 (file)
--- a/arch/s390/dfltcc_detail.h
+++ b/arch/s390/dfltcc_detail.h
@@ -1,4 +1,4 @@
-#include "../../zbuild.h"
+#include "zbuild.h"
 #include <stdio.h>
 
 #ifdef HAVE_SYS_SDT_H

diff --git a/arch/s390/s390_features.c b/arch/s390/s390_features.c
index 82901060ebbb2dbc63dcba388b18d3bfc78e37f8..629025d5bb14707f3f9c0881e681df5ae9a9170d 100644 (file)
--- a/arch/s390/s390_features.c
+++ b/arch/s390/s390_features.c
@@ -1,4 +1,4 @@
-#include "../../zbuild.h"
+#include "zbuild.h"
 #include "s390_features.h"
 
 #ifdef HAVE_SYS_AUXV_H

diff --git a/arch/x86/adler32_avx2.c b/arch/x86/adler32_avx2.c
index e3ac6705cef3581972105197fa6afbe250df9831..e2882cb7f875bd9e4b3811c84dee981f07e39299 100644 (file)
--- a/arch/x86/adler32_avx2.c
+++ b/arch/x86/adler32_avx2.c
@@ -9,10 +9,10 @@
 
 #ifdef X86_AVX2
 
-#include "../../zbuild.h"
+#include "zbuild.h"
 #include <immintrin.h>
-#include "../../adler32_fold.h"
-#include "../../adler32_p.h"
+#include "adler32_fold.h"
+#include "adler32_p.h"
 #include "adler32_avx2_p.h"
 #include "x86_intrins.h"
 

diff --git a/arch/x86/adler32_avx512.c b/arch/x86/adler32_avx512.c
index aa6cc170185b61cb40b06205276451fb423d8d3d..6f5671b7c87e67e39586c4f8691ca15bd39660bc 100644 (file)
--- a/arch/x86/adler32_avx512.c
+++ b/arch/x86/adler32_avx512.c
@@ -8,10 +8,10 @@
 
 #ifdef X86_AVX512
 
-#include "../../zbuild.h"
-#include "../../adler32_p.h"
-#include "../../adler32_fold.h"
-#include "../../cpu_features.h"
+#include "zbuild.h"
+#include "adler32_p.h"
+#include "adler32_fold.h"
+#include "cpu_features.h"
 #include <immintrin.h>
 #include "x86_intrins.h"
 #include "adler32_avx512_p.h"

diff --git a/arch/x86/adler32_avx512_vnni.c b/arch/x86/adler32_avx512_vnni.c
index 771f7ebe043f24d31ffba660ab131e1ccddfd65d..c4faceda25b97e79f67a6795cbbafe5c3104b2e9 100644 (file)
--- a/arch/x86/adler32_avx512_vnni.c
+++ b/arch/x86/adler32_avx512_vnni.c
@@ -9,11 +9,11 @@
 
 #ifdef X86_AVX512VNNI
 
-#include "../../zbuild.h"
-#include "../../adler32_p.h"
-#include "../../cpu_features.h"
+#include "zbuild.h"
+#include "adler32_p.h"
+#include "cpu_features.h"
 #include <immintrin.h>
-#include "../../adler32_fold.h"
+#include "adler32_fold.h"
 #include "x86_intrins.h"
 #include "adler32_avx512_p.h"
 #include "adler32_avx2_p.h"

diff --git a/arch/x86/adler32_sse42.c b/arch/x86/adler32_sse42.c
index 257a360982ed8737536929cb9a59e6a472d1ffec..0b1addbcaa836514510065f02998235288c86102 100644 (file)
--- a/arch/x86/adler32_sse42.c
+++ b/arch/x86/adler32_sse42.c
@@ -6,9 +6,9 @@
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
-#include "../../zbuild.h"
-#include "../../adler32_p.h"
-#include "../../adler32_fold.h"
+#include "zbuild.h"
+#include "adler32_p.h"
+#include "adler32_fold.h"
 #include "adler32_ssse3_p.h"
 #include <immintrin.h>
 

diff --git a/arch/x86/adler32_ssse3.c b/arch/x86/adler32_ssse3.c
index ae819d632e53aec0de6176d848c02b9b48934863..15e2f78ba35ac54fbb4a1f28062db4caeb98b8c3 100644 (file)
--- a/arch/x86/adler32_ssse3.c
+++ b/arch/x86/adler32_ssse3.c
@@ -6,8 +6,8 @@
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
-#include "../../zbuild.h"
-#include "../../adler32_p.h"
+#include "zbuild.h"
+#include "adler32_p.h"
 #include "adler32_ssse3_p.h"
 
 #ifdef X86_SSSE3

diff --git a/arch/x86/compare256_avx2.c b/arch/x86/compare256_avx2.c
index 1318a0e333a491e611693ea4dfa9b0819956c927..a706a30fafcbc3187e6baf923dd915f235aee2b6 100644 (file)
--- a/arch/x86/compare256_avx2.c
+++ b/arch/x86/compare256_avx2.c
@@ -3,7 +3,7 @@
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
-#include "../../zbuild.h"
+#include "zbuild.h"
 
 #include "fallback_builtins.h"
 

diff --git a/arch/x86/compare256_sse2.c b/arch/x86/compare256_sse2.c
index aad4bd240d2021e5c6d7d375ec19bc2ad6177ddb..015d5398b4bec0a74236c25c6ce8a945a9215380 100644 (file)
--- a/arch/x86/compare256_sse2.c
+++ b/arch/x86/compare256_sse2.c
@@ -3,7 +3,7 @@
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
-#include "../../zbuild.h"
+#include "zbuild.h"
 
 #include "fallback_builtins.h"
 

diff --git a/arch/x86/crc32_pclmulqdq_tpl.h b/arch/x86/crc32_pclmulqdq_tpl.h
index 05d3b15257f74617b06c792e537146773bba3cb6..7f29a5d0d131a2b1a51b28c99af38ad688d918fb 100644 (file)
--- a/arch/x86/crc32_pclmulqdq_tpl.h
+++ b/arch/x86/crc32_pclmulqdq_tpl.h
@@ -17,7 +17,7 @@
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
-#include "../../zbuild.h"
+#include "zbuild.h"
 
 #include <immintrin.h>
 #include <wmmintrin.h>
@@ -26,8 +26,8 @@
 #  include <immintrin.h>
 #endif
 
-#include "../../crc32_fold.h"
-#include "../../crc32_braid_p.h"
+#include "crc32_fold.h"
+#include "crc32_braid_p.h"
 #include "x86_intrins.h"
 #include <assert.h>
 

diff --git a/arch/x86/insert_string_sse42.c b/arch/x86/insert_string_sse42.c
index ae092a7e477f8c8b46579b0ba396afa68f459080..0cccf1d356a9e23b64d53419cb65efab329d8913 100644 (file)
--- a/arch/x86/insert_string_sse42.c
+++ b/arch/x86/insert_string_sse42.c
@@ -6,9 +6,9 @@
  */
 
 #ifdef X86_SSE42
-#include "../../zbuild.h"
+#include "zbuild.h"
 #include <nmmintrin.h>
-#include "../../deflate.h"
+#include "deflate.h"
 
 #define HASH_CALC(s, h, val)\
     h = _mm_crc32_u32(h, val)
@@ -20,5 +20,5 @@
 #define INSERT_STRING       insert_string_sse42
 #define QUICK_INSERT_STRING quick_insert_string_sse42
 
-#include "../../insert_string_tpl.h"
+#include "insert_string_tpl.h"
 #endif

diff --git a/arch/x86/slide_hash_avx2.c b/arch/x86/slide_hash_avx2.c
index 94fe10c7bf4a4ec527f8ab8e4e36952bdb298542..f49ad3331b8151f8c1ba427ed2e7b9157d2f6d8a 100644 (file)
--- a/arch/x86/slide_hash_avx2.c
+++ b/arch/x86/slide_hash_avx2.c
@@ -9,8 +9,8 @@
  *
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
-#include "../../zbuild.h"
-#include "../../deflate.h"
+#include "zbuild.h"
+#include "deflate.h"
 
 #include <immintrin.h>
 

diff --git a/arch/x86/slide_hash_sse2.c b/arch/x86/slide_hash_sse2.c
index 5daac4a73981c3b785d7a3d4d1eb9578cb5c3282..cfdf7bee49852b12cc1ec17165b7b8f3d586d103 100644 (file)
--- a/arch/x86/slide_hash_sse2.c
+++ b/arch/x86/slide_hash_sse2.c
@@ -8,8 +8,8 @@
  *
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
-#include "../../zbuild.h"
-#include "../../deflate.h"
+#include "zbuild.h"
+#include "deflate.h"
 
 #include <immintrin.h>
 #include <assert.h>

diff --git a/arch/x86/x86_features.c b/arch/x86/x86_features.c
index 8d11564c24f94ba72bf7307b60406bf8e83c8b44..fcd4cb35a6345a76e4569715d4af4e397e6ca484 100644 (file)
--- a/arch/x86/x86_features.c
+++ b/arch/x86/x86_features.c
@@ -7,7 +7,7 @@
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
-#include "../../zbuild.h"
+#include "zbuild.h"
 #include "x86_features.h"
 
 #ifdef _MSC_VER

diff --git a/configure b/configure
index 20fb91aeb0799df3b551d8e92c633ce396b58898..6de2624722ac3dece14cb9387eb2f7206b719ffd 100755 (executable)
--- a/configure
+++ b/configure
@@ -1941,7 +1941,7 @@ replace_in_file() {
 
 # update Makefile with the configure results
 
-INCLUDES="-I$SRCDIR"
+INCLUDES="-I$SRCDIR -I$SRCDIR/$ARCHDIR -I$SRCDIR/arch/generic"
 if [ "$SRCDIR" != "$BUILDDIR" ]; then INCLUDES="-I$BUILDDIR ${INCLUDES}"; fi
 
 sed < $SRCDIR/Makefile.in "
@@ -2044,15 +2044,12 @@ done
 # Generate Makefile in arch dir
 mkdir -p $ARCHDIR
 
-ARCHINCLUDES="-I$SRCDIR/$ARCHDIR -I$SRCDIR"
-if [ "$SRCDIR" != "$BUILDDIR" ]; then ARCHINCLUDES="-I$BUILDDIR ${ARCHINCLUDES}"; fi
-
 sed < $SRCDIR/$ARCHDIR/Makefile.in "
 /^CC *=/s#=.*#=$CC#
 /^CFLAGS *=/s#=.*#=$CFLAGS#
 /^SFLAGS *=/s#=.*#=$SFLAGS#
 /^LDFLAGS *=/s#=.*#=$LDFLAGS#
-/^INCLUDES *=/s#=.*#=$ARCHINCLUDES#
+/^INCLUDES *=/s#=.*#=$INCLUDES#
 /^SUFFIX *=/s#=.*#=$SUFFIX#
 /^SRCDIR *=/s#=.*#=$SRCDIR/$ARCHDIR#
 /^SRCTOP *=/s#=.*#=$SRCDIR#

diff --git a/win32/Makefile.a64 b/win32/Makefile.a64
index 2a0f3cfe4e7b2efbd39774500799f39267476a4f..ec4a1cc144cd8d732dddcf694e75dc03823c2198 100644 (file)
--- a/win32/Makefile.a64
+++ b/win32/Makefile.a64
@@ -23,7 +23,8 @@ LD = link
 AR = lib
 RC = rc
 CP = copy /y
-CFLAGS  = -nologo -MD -W3 -O2 -Oy- -Zi -Fd"zlib" $(LOC)
+INCLUDES = -I$(TOP) -I$(TOP)/arch/arm -I$(TOP)/arch/generic
+CFLAGS  = -nologo -MD -W3 -O2 -Oy- -Zi -Fd"zlib" $(LOC) $(INCLUDES)
 WFLAGS  = \
        -D_ARM64_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1 \
        -D_CRT_SECURE_NO_DEPRECATE \

diff --git a/win32/Makefile.arm b/win32/Makefile.arm
index 34dfe6bba6e1aa22b835053e505dc25229a2c253..4c7813f5592f6e57bfc2385d30dbf80910a89c49 100644 (file)
--- a/win32/Makefile.arm
+++ b/win32/Makefile.arm
@@ -23,7 +23,8 @@ LD = link
 AR = lib
 RC = rc
 CP = copy /y
-CFLAGS  = -nologo -MD -W3 -O2 -Oy- -Zi -Fd"zlib" $(LOC)
+INCLUDES = -I$(TOP) -I$(TOP)/arch/arm -I$(TOP)/arch/generic
+CFLAGS  = -nologo -MD -W3 -O2 -Oy- -Zi -Fd"zlib" $(LOC) $(INCLUDES)
 WFLAGS  = \
        -D_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1 \
        -D_CRT_SECURE_NO_DEPRECATE \

diff --git a/win32/Makefile.msc b/win32/Makefile.msc
index 3035072bec765f637b18b1949985a48cadfdcb98..044cc59670c9636b62970164aa67bdf669800303 100644 (file)
--- a/win32/Makefile.msc
+++ b/win32/Makefile.msc
@@ -23,7 +23,8 @@ LD = link
 AR = lib
 RC = rc
 CP = copy /y
-CFLAGS  = -nologo -MD -W3 -O2 -Oy- -Zi -Fd"zlib" $(LOC)
+INCLUDES = -I$(TOP) -I$(TOP)/arch/x86 -I$(TOP)/arch/generic
+CFLAGS  = -nologo -MD -W3 -O2 -Oy- -Zi -Fd"zlib" $(LOC) $(INCLUDES)
 WFLAGS  = \
        -D_CRT_SECURE_NO_DEPRECATE \
        -D_CRT_NONSTDC_NO_DEPRECATE \