Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Fixed] Add .main.cpp.swp and version.h to gitignore #68

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[Fixed] Add .main.cpp.swp and version.h to gitignore #68

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
# Precompiled Headers
*.gch
*.pch
version.h

# Libraries
*.lib
Expand Down Expand Up @@ -39,6 +40,9 @@ SPASM_i.c
SPASM_i.h
SPASM_h.h

# Temporary files
.*.swp

#######################################################################
# Visual Studio .gitignore
#######################################################################
Expand Down Expand Up @@ -276,4 +280,4 @@ _Pvt_Extensions
.paket/paket.exe

# FAKE - F# Make
.fake/
.fake/
Binary file removed .main.cpp.swp
View file
Open in desktop
Binary file not shown.
4 changes: 2 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ OBJ = $(addsuffix .o, $(basename $(SRC)))
OBJ_FILES = $(addsuffix .o, $(basename $(notdir $(SRC))))
EXE = $(if $(ISWIN),spasm.exe,spasm)

$(EXE): $(OBJ) Makefile
$(EXE): version $(OBJ) Makefile
$(CC) -o $@ $(OBJ_FILES) $(LDFLAGS)
$(STRIP) $@

Expand Down Expand Up @@ -93,7 +93,7 @@ coverage: clean check
clean:
rm -f $(OBJ) $(EXE) description-pak spasm-ng*.deb spasm-ng*.tar.gz
rm -f opt static prep-special-build
rm -f *.gcno *.gcda *.gcov
rm -f *.gcno *.gcda *.gcov version.h

version:
@./version.sh set
Expand Down
1 change: 0 additions & 1 deletion version.h
View file
Open in desktop

This file was deleted.