diff --git a/build/windows/installer/base_directories.isi b/build/windows/installer/base_directories.isi deleted file mode 100644 index 55a350ddef..0000000000 --- a/build/windows/installer/base_directories.isi +++ /dev/null @@ -1,71 +0,0 @@ -//directories to source files from -#define public - -#if !defined(VER_DIR) - #if defined(REVISION) - #define VER_DIR GIMP_VERSION + "-" + REVISION - #else - #define VER_DIR GIMP_VERSION - #endif -#endif - -#ifndef DIR32 -#define DIR32 "i686-w64-mingw32" -#endif -#ifndef DIR64 -#define DIR64 "x86_64-w64-mingw32" -#endif -#ifndef DIRA64 -#define DIRA64 "aarch64-w64-mingw32" -#endif - -#ifndef GIMP_DIR - #define GIMP_DIR "N:\gimp\output\" + VER_DIR -#endif -#ifndef DEPS_DIR - #define DEPS_DIR "N:\gimp\deps" -#endif - -//32-bit GIMP base directory (result of make install) -#ifndef GIMP_DIR32 - #define GIMP_DIR32 GIMP_DIR + "\" + DIR32 -#endif -//64-bit GIMP base directory (result of make install) -#ifndef GIMP_DIR64 - #define GIMP_DIR64 GIMP_DIR + "\" + DIR64 -#endif -//AArch64 GIMP base directory (result of make install) -#ifndef GIMP_DIRA64 - #define GIMP_DIRA64 GIMP_DIR + "\" + DIR64 -#endif - -#ifndef DDIR32 - #define DDIR32 DIR32 -#endif -#ifndef DDIR64 - #define DDIR64 DIR64 -#endif -#ifndef DDIRA64 - #define DDIRA64 DIRA64 -#endif - -//32-bit dependencies directory -#ifndef DEPS_DIR32 - #define DEPS_DIR32 DEPS_DIR + "\" + DDIR32 -#endif -//64-bit dependencies directory -#ifndef DEPS_DIR64 - #define DEPS_DIR64 DEPS_DIR + "\" + DDIR64 -#endif -//AArch64 dependencies directory -#ifndef DEPS_DIR64 - #define DEPS_DIRA64 DEPS_DIR + "\" + DDIRA64 -#endif - -#ifdef PYTHON - - //python source directory - #ifndef PY_DIR - #define PY_DIR "N:\common\python2.7" - #endif -#endif diff --git a/build/windows/installer/base_gimp3264.iss b/build/windows/installer/base_gimp3264.iss index b99463eec8..ed6a5d0c2b 100644 --- a/build/windows/installer/base_gimp3264.iss +++ b/build/windows/installer/base_gimp3264.iss @@ -86,7 +86,18 @@ #define X64 2 #define ARM64 3 -#include "base_directories.isi" +#define GIMP_DIR32 GIMP_DIR + "\" + DIR32 +#define GIMP_DIR64 GIMP_DIR + "\" + DIR64 +#define GIMP_DIRA64 GIMP_DIR + "\" + DIR64 + +#define DDIR32 DIR32 +#define DDIR64 DIR64 +#define DDIRA64 DIRA64 + +#define DEPS_DIR32 DEPS_DIR + "\" + DDIR32 +#define DEPS_DIR64 DEPS_DIR + "\" + DDIR64 +#define DEPS_DIRA64 DEPS_DIR + "\" + DDIRA64 + #define MAJOR=Copy(GIMP_VERSION,1,Pos(".",GIMP_VERSION)-1) #define MINOR=Copy(GIMP_VERSION,Pos(".",GIMP_VERSION)+1)