Fix wrong directory case in makefile. Fix building from monodevelop. Update gitignore

This commit is contained in:
Alex Corrado 2011-07-05 14:11:01 -04:00 коммит произвёл Alex Corrado
Родитель 6f371d68f9
Коммит 57d3d80710
3 изменённых файлов: 17 добавлений и 12 удалений

2
.gitignore поставляемый
Просмотреть файл

@ -14,3 +14,5 @@ bin/
*.userprefs
tests/output
src/generator/generator
*.pc
.DS_Store

Просмотреть файл

@ -2,7 +2,7 @@
EXTRA_DIST = m4/expansions.m4
if ENABLE_DEBUG
ASSEMBLY_COMPILER_COMMAND = mcs
ASSEMBLY_COMPILER_COMMAND = $(GMCS)
ASSEMBLY_COMPILER_FLAGS = -noconfig -codepage:utf8 -warn:4 -optimize- -debug "-define:DEBUG"
BUILD_DIR = $(top_srcdir)/bin/Debug
@ -14,7 +14,7 @@ MONO_CXXI_DLL_MDB=$(BUILD_DIR)/Mono.Cxxi.dll.mdb
endif
if ENABLE_RELEASE
ASSEMBLY_COMPILER_COMMAND = mcs
ASSEMBLY_COMPILER_COMMAND = $(GMCS)
ASSEMBLY_COMPILER_FLAGS = -noconfig -codepage:utf8 -warn:4 -optimize+
BUILD_DIR = $(top_srcdir)/bin/Release
@ -43,13 +43,13 @@ RESGEN=resgen2
all: $(ASSEMBLY) $(PROGRAMFILES) $(LINUX_PKGCONFIG)
FILES = \
ABI/CppAbi.cs \
ABI/Impl/ItaniumAbi.cs \
ABI/Impl/ItaniumTypeInfo.cs \
ABI/Impl/MsvcAbi.cs \
ABI/Impl/VirtualOnlyAbi.cs \
ABI/MethodType.cs \
ABI/VTable.cs \
Abi/CppAbi.cs \
Abi/Impl/ItaniumAbi.cs \
Abi/Impl/ItaniumTypeInfo.cs \
Abi/Impl/MsvcAbi.cs \
Abi/Impl/VirtualOnlyAbi.cs \
Abi/MethodType.cs \
Abi/VTable.cs \
AssemblyInfo.cs \
Attributes.cs \
CppField.cs \
@ -71,8 +71,8 @@ DATA_FILES =
RESOURCES =
EXTRAS = \
ABI \
ABI/Impl \
Abi \
Abi/Impl \
Util \
mono.cxxi.pc.in

Просмотреть файл

@ -50,7 +50,6 @@
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<ItemGroup>
<Compile Include="Support\CppMockObject.cs" />
<Compile Include="Support\CppNUnitAsserts.cs" />
<Compile Include="MarshalingTests.cs" />
<Compile Include="InheritanceTests.cs" />
@ -99,5 +98,9 @@
<Project>{4A864586-93C5-4DC1-8A80-F094A88506D7}</Project>
<Name>Mono.Cxxi</Name>
</ProjectReference>
<ProjectReference Include="..\src\generator\generator.csproj">
<Project>{AD0F9378-789C-4AF1-B0DD-6DD9A63C3401}</Project>
<Name>generator</Name>
</ProjectReference>
</ItemGroup>
</Project>