Browse Source

removed VC++ project files, commented Makefile.win

Nicolas Cannasse 13 năm trước cách đây
mục cha
commit
11138f6f71
3 tập tin đã thay đổi với 4 bổ sung178 xóa
  1. 4 2
      Makefile.win
  2. 0 21
      haxe.sln
  3. 0 155
      haxe.vcproj

+ 4 - 2
Makefile.win

@@ -14,19 +14,21 @@ NATIVE_LIBS += -I "c:/program files/mingw/lib/"
 LINEMERGE_FILTER=sed -n "/^File/!{H; bp; b; }; /^File/ bp; :p; { x; s/\n/ /g; p; }"
 LINEMERGE_FILTER=sed -n "/^File/!{H; bp; b; }; /^File/ bp; :p; { x; s/\n/ /g; p; }"
 
 
 # use make MSVC=1 -f Makefile.win to build for OCaml/MSVC
 # use make MSVC=1 -f Makefile.win to build for OCaml/MSVC
-# this will also convert the error messages to Visual Studio output format
 
 
 ifeq (${MSVC}, 1)
 ifeq (${MSVC}, 1)
 NATIVE_LIBS = shell32.lib libs/extc/extc_stubs.obj libs/extc/zlib/zlib.lib
 NATIVE_LIBS = shell32.lib libs/extc/extc_stubs.obj libs/extc/zlib/zlib.lib
-MSVC_OUTPUT=1
 endif
 endif
 
 
+# this will also convert the error messages to Visual Studio output format
+
 ifeq (${MSVC_OUTPUT}, 1)
 ifeq (${MSVC_OUTPUT}, 1)
 FILTER=sed "s/File \"\(.*\?\)\", line \([0-9]\+\), \(.*\)/\1(\2): \3/"
 FILTER=sed "s/File \"\(.*\?\)\", line \([0-9]\+\), \(.*\)/\1(\2): \3/"
 CC_CMD=$(OCAMLOPT) $(CFLAGS) -c $< 2>&1 | $(LINEMERGE_FILTER) | $(FILTER) 1>&2
 CC_CMD=$(OCAMLOPT) $(CFLAGS) -c $< 2>&1 | $(LINEMERGE_FILTER) | $(FILTER) 1>&2
 CC_PARSER_CMD=$(OCAMLOPT) -pp camlp4o $(CFLAGS) -c parser.ml 2>&1 | $(LINEMERGE_FILTER) | $(FILTER) 1>&2
 CC_PARSER_CMD=$(OCAMLOPT) -pp camlp4o $(CFLAGS) -c parser.ml 2>&1 | $(LINEMERGE_FILTER) | $(FILTER) 1>&2
 endif
 endif
 
 
+# this will also convert the error messages to Haxe/FlashDevelop output format
+
 ifeq (${FD_OUTPUT}, 1)
 ifeq (${FD_OUTPUT}, 1)
 FILTER=sed "s/File \"\(.*\?\)\", line \([0-9]\+\), characters \([0-9-]\+\):\(.*\)/\1:\2: characters \3 : \4/"
 FILTER=sed "s/File \"\(.*\?\)\", line \([0-9]\+\), characters \([0-9-]\+\):\(.*\)/\1:\2: characters \3 : \4/"
 endif
 endif

+ 0 - 21
haxe.sln

@@ -1,21 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 8.00
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "haxe", "haxe.vcproj", "{6194C08E-41F1-4013-9D50-58C89E401FA8}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
-Global
-	GlobalSection(SolutionConfiguration) = preSolution
-		Debug = Debug
-		Release = Release
-	EndGlobalSection
-	GlobalSection(ProjectConfiguration) = postSolution
-		{6194C08E-41F1-4013-9D50-58C89E401FA8}.Debug.ActiveCfg = Debug|Win32
-		{6194C08E-41F1-4013-9D50-58C89E401FA8}.Debug.Build.0 = Debug|Win32
-		{6194C08E-41F1-4013-9D50-58C89E401FA8}.Release.ActiveCfg = Release|Win32
-		{6194C08E-41F1-4013-9D50-58C89E401FA8}.Release.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-	EndGlobalSection
-	GlobalSection(ExtensibilityAddIns) = postSolution
-	EndGlobalSection
-EndGlobal

+ 0 - 155
haxe.vcproj

@@ -1,155 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="7.10"
-	Name="haxe"
-	ProjectGUID="{6194C08E-41F1-4013-9D50-58C89E401FA8}"
-	Keyword="MakeFileProj">
-	<Platforms>
-		<Platform
-			Name="Win32"/>
-	</Platforms>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="Debug"
-			IntermediateDirectory="Debug"
-			ConfigurationType="0">
-			<Tool
-				Name="VCNMakeTool"
-				BuildCommandLine="make MSVC=1 -j4 -f Makefile.win kill haxe"
-				ReBuildCommandLine="make MSVC=1 -f Makefile.win clean_haxe kill haxe"
-				CleanCommandLine="make -f Makefile.win clean_haxe"
-				Output="haxe.exe"/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="Release"
-			IntermediateDirectory="Release"
-			ConfigurationType="0">
-			<Tool
-				Name="VCNMakeTool"
-				BuildCommandLine="make MSVC=1 -j4 -f Makefile.win kill haxe"
-				ReBuildCommandLine="make MSVC=1 -f Makefile.win kill clean_haxe haxe"
-				CleanCommandLine="make -f Makefile.win kill clean_haxe"
-				Output="haxe.exe"/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="neko"
-			Filter="">
-			<File
-				RelativePath=".\libs\neko\binast.ml">
-			</File>
-			<File
-				RelativePath=".\libs\neko\nast.ml">
-			</File>
-			<File
-				RelativePath=".\libs\neko\nbytecode.ml">
-			</File>
-			<File
-				RelativePath=".\libs\neko\ncompile.ml">
-			</File>
-			<File
-				RelativePath=".\libs\neko\nxml.ml">
-			</File>
-		</Filter>
-		<Filter
-			Name="AS3"
-			Filter="">
-			<File
-				RelativePath=".\libs\swflib\as3.mli">
-			</File>
-			<File
-				RelativePath=".\libs\swflib\as3hl.mli">
-			</File>
-			<File
-				RelativePath=".\libs\swflib\swf.ml">
-			</File>
-		</Filter>
-		<Filter
-			Name="gen"
-			Filter="">
-			<File
-				RelativePath=".\genas3.ml">
-			</File>
-			<File
-				RelativePath=".\gencommon.ml">
-			</File>
-			<File
-				RelativePath=".\gencpp.ml">
-			</File>
-			<File
-				RelativePath=".\gencs.ml">
-			</File>
-			<File
-				RelativePath=".\genjava.ml">
-			</File>
-			<File
-				RelativePath=".\genjs.ml">
-			</File>
-			<File
-				RelativePath=".\genneko.ml">
-			</File>
-			<File
-				RelativePath=".\genphp.ml">
-			</File>
-			<File
-				RelativePath=".\genswf.ml">
-			</File>
-			<File
-				RelativePath=".\genswf8.ml">
-			</File>
-			<File
-				RelativePath=".\genswf9.ml">
-			</File>
-			<File
-				RelativePath=".\genxml.ml">
-			</File>
-		</Filter>
-		<File
-			RelativePath=".\ast.ml">
-		</File>
-		<File
-			RelativePath=".\codegen.ml">
-		</File>
-		<File
-			RelativePath=".\common.ml">
-		</File>
-		<File
-			RelativePath=".\dce.ml">
-		</File>
-		<File
-			RelativePath=".\interp.ml">
-		</File>
-		<File
-			RelativePath=".\lexer.mll">
-		</File>
-		<File
-			RelativePath=".\main.ml">
-		</File>
-		<File
-			RelativePath=".\optimizer.ml">
-		</File>
-		<File
-			RelativePath=".\parser.ml">
-		</File>
-		<File
-			RelativePath=".\type.ml">
-		</File>
-		<File
-			RelativePath=".\typecore.ml">
-		</File>
-		<File
-			RelativePath=".\typeload.ml">
-		</File>
-		<File
-			RelativePath=".\typer.ml">
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>