Change in makefile and folder structure

This commit is contained in:
Florian Reitz 2017-11-30 13:00:06 +01:00
parent 2df245675d
commit 331b84cc17
5 changed files with 915 additions and 899 deletions

View File

@ -11,9 +11,9 @@
</ProjectConfiguration> </ProjectConfiguration>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="appleiisd.cfg" />
<None Include="AppleIISd.s" />
<None Include="makefile" /> <None Include="makefile" />
<None Include="src\AppleIISd.cfg" />
<None Include="src\AppleIISd.s" />
</ItemGroup> </ItemGroup>
<PropertyGroup Label="Globals"> <PropertyGroup Label="Globals">
<ProjectGuid>{9EA7EC3D-1771-420F-932F-231A35ED1200}</ProjectGuid> <ProjectGuid>{9EA7EC3D-1771-420F-932F-231A35ED1200}</ProjectGuid>
@ -50,14 +50,12 @@
<LibraryPath>C:\cc65\lib</LibraryPath> <LibraryPath>C:\cc65\lib</LibraryPath>
<LibraryWPath /> <LibraryWPath />
<ExcludePath /> <ExcludePath />
<NMakeBuildCommandLine>$(MAKE_HOME)\make -C "$(ProjectDir)\" PROGRAM="$(ProjectDir)$(Configuration)\$(ProjectName)" OPTIONS=mapfile,listing</NMakeBuildCommandLine> <NMakeBuildCommandLine>$(MAKE_HOME)\make OPTIONS=mapfile,listing</NMakeBuildCommandLine>
<SourcePath>$(ProjectDir)\src</SourcePath> <SourcePath>$(ProjectDir)\src</SourcePath>
<NMakeReBuildCommandLine>$(MAKE_HOME)\make clean -C "$(ProjectDir)\" PROGRAM="$(ProjectDir)$(Configuration)\$(ProjectName)" <NMakeReBuildCommandLine>$(MAKE_HOME)\make clean
$(MAKE_HOME)\make -C "$(ProjectDir)\" PROGRAM="$(ProjectDir)$(Configuration)/$(ProjectName)" OPTIONS=mapfile,listing $(MAKE_HOME)\make OPTIONS=mapfile,listing</NMakeReBuildCommandLine>
rmdir /S /Q "$(ProjectDir)obj" <OutDir>$(SolutionDir)\</OutDir>
rmdir /S /Q "$(SolutionDir)Debug"</NMakeReBuildCommandLine> <NMakeCleanCommandLine>$(MAKE_HOME)\make clean</NMakeCleanCommandLine>
<OutDir>$(SolutionDir)$(Configuration)\</OutDir>
<NMakeCleanCommandLine>$(MAKE_HOME)\make clean -C "$(ProjectDir)\" PROGRAM="$(ProjectDir)$(Configuration)\$(ProjectName)"</NMakeCleanCommandLine>
<ReferencePath /> <ReferencePath />
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@ -85,6 +83,7 @@ rmdir /S /Q "$(SolutionDir)Release"</NMakeCleanCommandLine>
<LibraryPath>C:\cc65\lib</LibraryPath> <LibraryPath>C:\cc65\lib</LibraryPath>
<ExcludePath /> <ExcludePath />
<LibraryWPath /> <LibraryWPath />
<OutDir>$(SolutionDir)$\</OutDir>
</PropertyGroup> </PropertyGroup>
<ItemDefinitionGroup> <ItemDefinitionGroup>
</ItemDefinitionGroup> </ItemDefinitionGroup>

17
AppleIISd.vcxproj.filters Normal file
View File

@ -0,0 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<None Include="makefile" />
<None Include="src\AppleIISd.cfg">
<Filter>src</Filter>
</None>
<None Include="src\AppleIISd.s">
<Filter>src</Filter>
</None>
</ItemGroup>
<ItemGroup>
<Filter Include="src">
<UniqueIdentifier>{d301b76d-0aac-4430-a25a-193e6e572e60}</UniqueIdentifier>
</Filter>
</ItemGroup>
</Project>

View File

@ -13,7 +13,7 @@ TARGETS := apple2enh
# Name of the final, single-file executable. # Name of the final, single-file executable.
# Default: name of the current dir with target name appended # Default: name of the current dir with target name appended
PROGRAM := appleiisd PROGRAM := AppleIISd
# Path(s) to additional libraries required for linking the program # Path(s) to additional libraries required for linking the program
# Use only if you don't want to place copies of the libraries in SRCDIR # Use only if you don't want to place copies of the libraries in SRCDIR
@ -23,7 +23,7 @@ LIBS :=
# Custom linker configuration file # Custom linker configuration file
# Use only if you don't want to place it in SRCDIR # Use only if you don't want to place it in SRCDIR
# Default: none # Default: none
CONFIG := appleiisd.cfg CONFIG :=
# Additional C compiler flags and options. # Additional C compiler flags and options.
# Default: none # Default: none
@ -39,7 +39,7 @@ LDFLAGS =
# Path to the directory containing C and ASM sources. # Path to the directory containing C and ASM sources.
# Default: src # Default: src
SRCDIR := . SRCDIR :=
# Path to the directory where object files are to be stored (inside respective target subdirectories). # Path to the directory where object files are to be stored (inside respective target subdirectories).
# Default: obj # Default: obj