Skip to content

Commit ef0de27

Browse files
committed
Run pre-commit hooks.
Remove whitespace and remove unnecessary executable flags.
1 parent 02e9834 commit ef0de27

File tree

3 files changed

+15
-15
lines changed

3 files changed

+15
-15
lines changed

build/make/makefile-mingw

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# umbra mingw makefile
2-
# run "make -f makefile-mingw demo"
2+
# run "make -f makefile-mingw demo"
33
SRCDIR=src
44
LIBTCODDIR=../svn-libtcod
55
CPP=mingw32-g++
@@ -8,15 +8,15 @@ UPX=../mak/upx.exe
88
CFLAGS=$(FLAGS) -I$(LIBTCODDIR)/include -Wall
99

1010
$(TEMP)/umbra/debug/%.o : $(SRCDIR)/umbra/%.cpp
11-
$(CPP) $(CFLAGS) -g -o $@ -c $<
11+
$(CPP) $(CFLAGS) -g -o $@ -c $<
1212
$(TEMP)/umbra/release/%.o : $(SRCDIR)/umbra/%.cpp
13-
$(CPP) $(CFLAGS) -DNDEBUG -O2 -s -o $@ -c $<
13+
$(CPP) $(CFLAGS) -DNDEBUG -O2 -s -o $@ -c $<
1414
$(TEMP)/fov/debug/%.o : $(SRCDIR)/fov/%.cpp
15-
$(CPP) $(CFLAGS) -g -o $@ -c $<
15+
$(CPP) $(CFLAGS) -g -o $@ -c $<
1616
$(TEMP)/umbra/demo/debug/%.o : $(SRCDIR)/demo/%.cpp
17-
$(CPP) $(CFLAGS) -g -o $@ -c $<
17+
$(CPP) $(CFLAGS) -g -o $@ -c $<
1818
$(TEMP)/fov/release/%.o : $(SRCDIR)/fov/%.cpp
19-
$(CPP) $(CFLAGS) -DNDEBUG -O2 -s -o $@ -c $<
19+
$(CPP) $(CFLAGS) -DNDEBUG -O2 -s -o $@ -c $<
2020

2121
OBJS_UMBRA_DEBUG= \
2222
$(TEMP)/umbra/debug/umbra_callback.o \
@@ -31,13 +31,13 @@ OBJS_UMBRA_DEBUG= \
3131
$(TEMP)/umbra/debug/umbra_stylesheet.o \
3232
$(TEMP)/umbra/debug/umbra_widget.o \
3333
$(TEMP)/umbra/debug/umbra_widget_button.o \
34-
$(TEMP)/umbra/debug/umbra_widget_checkbox.o
34+
$(TEMP)/umbra/debug/umbra_widget_checkbox.o
3535

3636
OBJS_FOVTC_DEBUG= \
3737
$(TEMP)/fov/debug/bsp_helper.o \
3838
$(TEMP)/fov/debug/fov_setup.o \
3939
$(TEMP)/fov/debug/fov_test.o \
40-
$(TEMP)/fov/debug/main.o
40+
$(TEMP)/fov/debug/main.o
4141

4242
OBJS_DEMO_DEBUG= \
4343
$(TEMP)/umbra/demo/debug/rabbit.o \
@@ -46,7 +46,7 @@ OBJS_DEMO_DEBUG= \
4646
$(TEMP)/umbra/demo/debug/matrix.o \
4747
$(TEMP)/umbra/demo/debug/main.o \
4848
$(TEMP)/umbra/demo/debug/demo.o \
49-
$(TEMP)/umbra/demo/debug/credits.o
49+
$(TEMP)/umbra/demo/debug/credits.o
5050

5151
OBJS_RELEASE= \
5252
$(TEMP)/umbra/release/umbra_callback.o \
@@ -66,7 +66,7 @@ OBJS_RELEASE= \
6666
$(TEMP)/fov/release/bsp_helper.o \
6767
$(TEMP)/fov/release/fov_setup.o \
6868
$(TEMP)/fov/release/fov_test.o \
69-
$(TEMP)/fov/release/main.o
69+
$(TEMP)/fov/release/main.o
7070

7171
all : debug release
7272

@@ -81,27 +81,27 @@ $(TEMP)/umbra/debug :
8181

8282
$(TEMP)/umbra/demo/debug :
8383
\mkdir -p $@
84-
84+
8585
$(TEMP)/umbra/release :
8686
\mkdir -p $@
8787

8888
$(TEMP)/fov/debug :
8989
\mkdir -p $@
90-
90+
9191
$(TEMP)/fov/release :
9292
\mkdir -p $@
93-
93+
9494
fovtc.exe : $(TEMP)/fov/release $(TEMP)/umbra/release $(OBJS_RELEASE)
9595
$(CPP) $(OBJS_RELEASE) -o $@ -L$(LIBTCODDIR)/lib -ltcod-mingw -mwindows
9696

97-
fovtc_debug.exe : $(TEMP)/fov/debug $(TEMP)/umbra/debug $(OBJS_UMBRA_DEBUG) $(OBJS_FOVTC_DEBUG)
97+
fovtc_debug.exe : $(TEMP)/fov/debug $(TEMP)/umbra/debug $(OBJS_UMBRA_DEBUG) $(OBJS_FOVTC_DEBUG)
9898
$(CPP) $(OBJS_UMBRA_DEBUG) $(OBJS_FOVTC_DEBUG) -o $@ -L$(LIBTCODDIR)/lib -ltcod-mingw-debug -mwindows
9999

100100
demo_debug.exe : $(TEMP)/umbra/demo/debug $(TEMP)/umbra/debug $(OBJS_DEMO_DEBUG) $(OBJS_UMBRA_DEBUG)
101101
$(CPP) $(OBJS_UMBRA_DEBUG) $(OBJS_DEMO_DEBUG) -o $@ -L$(LIBTCODDIR)/lib -ltcod-mingw-debug -mwindows
102102

103103
clean :
104-
\rm -f $(OBJS_RELEASE) fovtc.exe $(OBJS_FOVTC_DEBUG) $(OBJS_DEMO_DEBUG) fovtc_debug.exe demo_debug.exe
104+
\rm -f $(OBJS_RELEASE) fovtc.exe $(OBJS_FOVTC_DEBUG) $(OBJS_DEMO_DEBUG) fovtc_debug.exe demo_debug.exe
105105

106106
cleanall : clean
107107
\rm -f $(OBJS_UMBRA_DEBUG)

src/demo/demo.cpp

100755100644
File mode changed.

src/demo/demo.hpp

100755100644
File mode changed.

0 commit comments

Comments
 (0)