Menu

Commit [r2641]  Maximize  Restore  History

Merged content of Common.mak into Makefile and removed Common.mak.

delphidabbler 2013-01-06

removed /trunk/Src/Common.mak
changed /trunk/Src/Makefile
/trunk/Src/Common.mak
File was removed.
/trunk/Src/Makefile Diff Switch to side-by-side view
--- a/trunk/Src/Makefile
+++ b/trunk/Src/Makefile
@@ -15,11 +15,34 @@
 BIN = ..\Bin
 EXE = ..\Exe
 
-!include Common.mak
-
-# Define macros for all tools that are not common
+# Check for required environment variables
+
+!ifdef DELPHI2010
+DELPHIROOT = $(DELPHI2010)
+!endif
+!ifndef DELPHIROOT
+!error DELPHIROOT or DELPHI2010 environment variable required.
+!endif
+
+!ifndef INDY10
+!error INDY10 environment variable required.
+!endif
+
+# Define macros for required tools
 
 TLIBIMP = "$(DELPHIROOT)\Bin\TLibImp.exe"
+
+MAKE = "$(MAKEDIR)\Make.exe" -$(MAKEFLAGS)
+
+DCC32 = "$(DELPHIROOT)\Bin\DCC32.exe"
+
+BRCC32 = "$(DELPHIROOT)\Bin\BRCC32.exe"
+
+!ifdef VIEDROOT
+VIED = "$(VIEDROOT)\VIEd.exe" -makerc
+!else
+VIED = VIEd.exe -makerc
+!endif
 
 !ifdef HTMLRESROOT
 HTMLRES = "$(HTMLRESROOT)\HTMLRes.exe"
@@ -59,6 +82,28 @@
 # MIDL.exe can be ignored if IGNOREMIDL macro is defined: replace with echo
 MIDL = @echo *** IGNORING MIDL
 !endif
+
+# Command line options
+!ifdef PORTABLE
+DELPHIDEFINES = "-DPORTABLE"
+!else
+DELPHIDEFINES =
+!endif
+
+# Implicit rules
+
+# Resource files are compiled to the directory specified by BIN macro, which
+# must have been set by the caller.
+.rc.res:
+  @echo +++ Compiling Resource file $< +++
+  @$(BRCC32) $< -fo$(BIN)\$(@F)
+
+# Version info files are compiled by VIEd. A temporary .rc file is left behind
+.vi.rc:
+  @echo +++ Compiling Version Info file $< +++
+  @$(VIED) .\$<
+
+# Explicit rules
 
 # Default is to build everything and release
 everything: config exes setup release
@@ -100,7 +145,6 @@
   @if exist $(EXE)\$(@F).bak del $(EXE)\$(@F).bak
 !endif
 
-
 # Builds help file
 help:
   -1 @$(HHC) .\Help\CodeSnip.chm
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.