Browse Source

Fix compilation of installer for win32 target

git-svn-id: trunk@40481 -
pierre 6 years ago
parent
commit
2c64982f82
4 changed files with 590 additions and 279 deletions
  1. 218 274
      installer/Makefile
  2. 1 2
      installer/Makefile.fpc
  3. 364 1
      packages/ide/Makefile
  4. 7 2
      packages/ide/Makefile.fpc

File diff suppressed because it is too large
+ 218 - 274
installer/Makefile


+ 1 - 2
installer/Makefile.fpc

@@ -19,10 +19,9 @@ files_linux=installer.pas
 files_freebsd=installer.pas
 files_freebsd=installer.pas
 
 
 [require]
 [require]
-packages=rtl-console fv unzip rtl-extra
+packages=rtl-console fv unzip rtl-extra ide
 
 
 [compiler]
 [compiler]
-unitdir=../ide
 
 
 [install]
 [install]
 fpcpackage=y
 fpcpackage=y

File diff suppressed because it is too large
+ 364 - 1
packages/ide/Makefile


+ 7 - 2
packages/ide/Makefile.fpc

@@ -1,8 +1,13 @@
 #
 #
 #   Makefile.fpc for running fpmake
 #   Makefile.fpc for running fpmake
 #
 #
+[package]
+name=ide
+version=3.3.1
+
 [require]
 [require]
-packages=rtl fpmkunit
+packages=rtl fpmkunit rtl-extra fv chm regexpr
+packages_go32v2=graph
 
 
 [install]
 [install]
 fpcpackage=y
 fpcpackage=y
@@ -67,7 +72,7 @@ ifdef GDBMI
 FPMAKE_OPT+=--GDBMI=1
 FPMAKE_OPT+=--GDBMI=1
 # If the rtl does not require libc, then
 # If the rtl does not require libc, then
 # IDE compiled with GDBMI should be a static executable
 # IDE compiled with GDBMI should be a static executable
-# and can thus be cross-compiled 
+# and can thus be cross-compiled
 ifeq ($(findstring $(OS_TARGET),aix beos darwin haiku solaris),)
 ifeq ($(findstring $(OS_TARGET),aix beos darwin haiku solaris),)
 GDBMI_IS_STATIC=1
 GDBMI_IS_STATIC=1
 endif
 endif

Some files were not shown because too many files changed in this diff