Kaynağa Gözat

Added option for skipping module builds.

git-svn-id: http://bmkng.googlecode.com/svn/trunk@22 2a3afde7-ceff-d69e-269d-2b6c215c828a
[email protected] 14 yıl önce
ebeveyn
işleme
b8cdcf3146
6 değiştirilmiş dosya ile 50 ekleme ve 7 silme
  1. 1 0
      bmk.bmx
  2. 1 1
      bmk_config.bmx
  3. 15 1
      bmk_make.bmx
  4. 1 1
      bmk_util.bmx
  5. 10 4
      custom.bmk
  6. 22 0
      make.bmk

+ 1 - 0
bmk.bmx

@@ -1,5 +1,6 @@
 '
 ' Change History :
+' 2.10 24/02/2011 - Added option for skipping module builds.
 ' 2.09 30/04/2010 - Fixed loadBMK to work for local app folder.
 ' 2.08 05/04/2010 - Added Tommo's include speedup fix.
 '                   Fixed PPC universal link issue.

+ 1 - 1
bmk_config.bmx

@@ -5,7 +5,7 @@ Import BRL.MaxUtil
 
 Import Pub.MacOS
 
-Const BMK_VERSION:String = "2.09"
+Const BMK_VERSION:String = "2.10"
 
 Const ALL_SRC_EXTS$="bmx;i;c;m;h;cpp;cxx;mm;hpp;hxx;s;cc"
 

+ 15 - 1
bmk_make.bmx

@@ -122,13 +122,27 @@ End Function
 
 'returns mod interface file
 Function MakeMod:TFile( mod_name$, isRequired:Int = False )
-'Print "MakeMod : " + mod_name
+
 	Local path$=ModulePath(mod_name)
 	Local id$=ModuleIdent(mod_name)
 	Local src_path$=path+"/"+id+".bmx"
 	Local arc_path$=path+"/"+id+opt_configmung+processor.CPU()+".a"
 	Local iface_path$=path+"/"+id+opt_configmung+processor.CPU()+".i"
 
+	Local skip:String = globals.Get("skip_mod")
+	If skip Then
+		skip :+ " "
+		Local name:String = mod_name + " "
+		If skip.tolower().find(name.tolower()) >= 0 Then
+			If opt_debug Then
+				Print "Skipping " + mod_name + " (d)"
+			Else
+				Print "Skipping " + mod_name + " (r)"
+			End If
+			Return
+		End If
+	End If
+
 	mod_opts = New TModOpt ' BaH
 
 	Local iface:TFile=FindFile( iface_path,src_files )

+ 1 - 1
bmk_util.bmx

@@ -164,7 +164,7 @@ Function LinkApp( path$,lnk_files:TList,makelib )
 			cmd:+" -arch i386 -read_only_relocs suppress"
 		EndIf
 		If macos_version>=$1050
-			cmd:+" -mmacosx-version-min=10.3"
+			cmd:+" -mmacosx-version-min=10.5"
 		EndIf
 	
 		cmd:+" -o "+CQuote( path )

+ 10 - 4
custom.bmk

@@ -1,7 +1,13 @@
 
-setccopt optimization -O3
+#compiler optimisation
+#setccopt optimization -O3
 
-setwin32ccopt arch -march=pentium3
+# specific architecture
+#setwin32ccopt arch -march=pentium3
 
-setmacx86ccopt arch -march=nocona
-setmacx86ccopt math -msse3
+#setmacx86ccopt arch -march=nocona
+#setmacx86ccopt math -msse3
+
+# skipping modules
+#skipmod bah.bigint
+#skipmodwin32 bah.cegui

+ 22 - 0
make.bmk

@@ -216,6 +216,28 @@
 	make.Make(arg1)
 @end
 
+@define skipmod
+	globals.Add("skip_mod", arg1)
+@end
+
+@define skipmodwin32
+	if bmk.Platform() == "win32" then
+		globals.Add("skip_mod", arg1)
+	end
+@end
+
+@define skipmodmac
+	if bmk.Platform() == "macos" then
+		globals.Add("skip_mod", arg1)
+	end
+@end
+
+@define skipmodlinux
+	if bmk.Platform() == "linux" then
+		globals.Add("skip_mod", arg1)
+	end
+@end
+
 # the default ccopts
 # used for compiling c-type files
 @define default_cc_opts