Home Explore Help
Register Sign In
oberon
/
A2OS
mirror of https://github.com/yarrom/A2OS.git
2
0
Fork 0
Files Issues 0 Wiki
Browse Source

Removed obsolete LINUX32 and LINUX64 prefixes

git-svn-id: https://svn.inf.ethz.ch/svn/lecturers/a2/trunk@8242 8c9fc860-2736-0410-a75d-ab315db34111
negelef 7 years ago
parent
d16cf2960c
commit
44ea979b4e
2 changed files with 5 additions and 5 deletions
Split View Show Diff Stats
  1. 2 2
      source/Compiler.Mod
  2. 3 3
      source/Release.Tool

+ 2 - 2
source/Compiler.Mod
View File 

@@ -583,8 +583,8 @@ BEGIN
 
 	DoAddPlatform("TRM","-b=TRM --objectFile=Generic --metaData=simple --objectFileExtension=.GofT --symbolFileExtension=.SymT --define=ARM");
 
 	DoAddPlatform("TRMI","-b=TRM --objectFile=Intermediate --metaData=simple --objectFileExtension=.IroT --symbolFileExtension=.IrsT --define=ARM");
 
 	DoAddPlatform("ARMA2","-b=ARM --mergeSections --define=ARM");
 
-	DoAddPlatform("Linux32","-b=AMD --bits=32 --mergeSections --traceModule=Trace --objectFileExtension=.GofU --symbolFileExtension=.SymU --preciseGC --cellsAreObjects --platformCC=C --define=LINUX32,UNIX,I386");
 
-	DoAddPlatform("Linux64","-b=AMD --bits=64 --mergeSections --traceModule=Trace --objectFileExtension=.GofUu --symbolFileExtension=.SymUu --preciseGC --cellsAreObjects --platformCC=C --define=LINUX64,UNIX,AMD64");
 
+	DoAddPlatform("Linux32","-b=AMD --bits=32 --mergeSections --traceModule=Trace --objectFileExtension=.GofU --symbolFileExtension=.SymU --preciseGC --cellsAreObjects --platformCC=C --define=UNIX,I386");
 
+	DoAddPlatform("Linux64","-b=AMD --bits=64 --mergeSections --traceModule=Trace --objectFileExtension=.GofUu --symbolFileExtension=.SymUu --preciseGC --cellsAreObjects --platformCC=C --define=UNIX,AMD64");
 
 	
 	SetupDefaults;
 
 END Compiler.

+ 3 - 3
source/Release.Tool
View File 

@@ -182,7 +182,7 @@ BUILDS
 
 		DISABLED "FALSE"
 
 	}
 
 	Linux32 {
 
-		INCLUDE "LINUX32 UNIX I386"
 
+		INCLUDE "UNIX I386"
 
 		COMPILER "Compiler.Compile"
 
 		COMPILEOPTIONS "-p=Linux32"
 
 		PATH "./NewAos/"
 
@@ -283,8 +283,8 @@ PACKAGE Kernel ARCHIVE "Kernel.zip" SOURCE "KernelSrc.zip" DESCRIPTION "A2 Kerne
 
 	WIN32C { Windows.Environment.Mod }
 
 	UNIX & COOP { Unix.Environment.Mod }
 
 
-	LINUX32 { Linux.Glue.Mod Linux.I386.Unix.Mod }
 
-	LINUX64 { Linux.Glue.Mod Linux.AMD64.Unix.Mod }
 
+	LINUX & I386 { Linux.Glue.Mod Linux.I386.Unix.Mod }
 
+	LINUX & AMD64 { Linux.Glue.Mod Linux.AMD64.Unix.Mod }
 
 	DARWIN32 { Unix.Glue.Mod Darwin.I386.Unix.Mod }
 
 	DARWIN64 { Unix.Glue.Mod Darwin.AMD64.Unix.Mod }
 
 	SOLARIS { Unix.Glue.Mod Solaris.Unix.Mod }