reverted some changes in makefile

This commit is contained in:
jeefo 2016-09-13 22:45:47 +03:00
commit cf7fca3039
3 changed files with 18 additions and 15 deletions

View file

@ -109,25 +109,20 @@ release:
mkdir -p release mkdir -p release
$(MAKE) main DEBUG=false $(MAKE) main DEBUG=false
release_mac: release_osx:
$(MAKE) main MAC=true DEBUG=false mkdir -p release
$(MAKE) main OSX=true DEBUG=false
debug_mac: debug_osx:
$(MAKE) main MAC=true DEBUG=true mkdir -p debug
$(MAKE) main OSX=true DEBUG=true
all_linux: all_linux: release debug
release debug all_osx: release_osx debug_osx
all: all_linux all_osx
all_mac: default: all
release_mac debug_mac
all:
all_linux all_mac
default:
all_linux
clean: clean:
rm -rf release rm -rf release
rm -rf debug rm -rf debug

View file

@ -41,6 +41,9 @@
<ItemGroup> <ItemGroup>
<ResourceCompile Include="yapb.rc" /> <ResourceCompile Include="yapb.rc" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<None Include="makefile" />
</ItemGroup>
<PropertyGroup Label="Globals"> <PropertyGroup Label="Globals">
<ProjectGuid>{C232645A-3B99-48F4-A1F3-F20CF0A9568B}</ProjectGuid> <ProjectGuid>{C232645A-3B99-48F4-A1F3-F20CF0A9568B}</ProjectGuid>
<RootNamespace>yapb</RootNamespace> <RootNamespace>yapb</RootNamespace>

View file

@ -95,4 +95,9 @@
<Filter>project</Filter> <Filter>project</Filter>
</ResourceCompile> </ResourceCompile>
</ItemGroup> </ItemGroup>
<ItemGroup>
<None Include="makefile">
<Filter>project</Filter>
</None>
</ItemGroup>
</Project> </Project>