1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
|
--- Makefile.orig 2021-08-05 11:49:41 UTC
+++ Makefile
@@ -42,7 +42,6 @@ endif
## Begin customization points for each OS and TOOLCHAIN we support.
-ifeq (${OS},linux)
CXXFLAGS_EARLY += -DLINUX
EXE_EXTENSION :=
LDFLAGS_GL := -lGL
@@ -51,7 +50,6 @@ ifeq (${OS},linux)
LDFLAGS_SDL := -lSDL -lSDL_gfx -lSDL_mixer -lSDL_ttf -lpthread -lz
OBJ_EXTENSION := .o
hyper_RES :=
-endif
ifeq (${OS},mingw)
CXXFLAGS_EARLY += -DWINDOWS -mwindows -D_A_VOLID=8
@@ -79,29 +77,13 @@ ifeq (${OS},osx)
hyper_RES :=
endif
-ifeq (${TOOLCHAIN},clang)
CXXFLAGS_STD = -std=c++11
- CXXFLAGS_EARLY += -march=native -fPIC
- CXXFLAGS_EARLY += -W -Wall -Wextra -Wsuggest-override -Werror -pedantic
+ CXXFLAGS_EARLY += -fPIC
+ CXXFLAGS_EARLY += -W -Wall -Wextra -Wsuggest-override -pedantic
CXXFLAGS_EARLY += -Wno-unused-parameter -Wno-implicit-fallthrough -Wno-maybe-uninitialized -Wno-unknown-warning-option
CXXFLAGS_EARLY += -Wno-invalid-offsetof
-endif
-ifeq (${TOOLCHAIN},gcc)
- CXXFLAGS_STD = -std=c++11
- CXXFLAGS_EARLY += -march=native -fPIC
- CXXFLAGS_EARLY += -W -Wall -Wextra -Werror -pedantic
- CXXFLAGS_EARLY += -Wno-unused-parameter -Wno-implicit-fallthrough -Wno-maybe-uninitialized
-endif
-ifeq (${TOOLCHAIN},mingw)
- CXXFLAGS_STD = -std=c++11
- CXXFLAGS_EARLY += -march=native
- CXXFLAGS_EARLY += -W -Wall -Wextra -Werror
- CXXFLAGS_EARLY += -Wno-unused-parameter -Wno-implicit-fallthrough -Wno-maybe-uninitialized
-endif
-
-
## We have now finished OS-specific and TOOLCHAIN-specific computations.
## Begin customization points for user-specifiable HYPERROGUE_USE_XXX macros.
@@ -139,19 +121,19 @@ override CXXFLAGS := $(CXXFLAGS_STD) $(CXXFLAGS_EARLY)
override LDFLAGS := $(LDFLAGS_EARLY) $(LDFLAGS) ${EXTRA_LDFLAGS}
hyperrogue$(EXE_EXTENSION): $(hyper_OBJS) $(hyper_RES)
- $(CXX) $(CXXFLAGS) $(hyper_OBJS) $(hyper_RES) $(LDFLAGS) $(hyper_LDFLAGS) -o $@
+ $(CXX) $(hyper_OBJS) $(hyper_RES) $(LDFLAGS) $(hyper_LDFLAGS) $(LDFLAGS) -o $@
hyper$(OBJ_EXTENSION): *.cpp language-data.cpp autohdr.h
- $(CXX) -O2 $(CXXFLAGS) $(hyper_CXXFLAGS) -c hyper.cpp -o $@
+ $(CXX) $(CXXFLAGS) $(hyper_CXXFLAGS) -c hyper.cpp -o $@
hyper.res: hyper.rc hr-icon.ico
windres hyper.rc -O coff -o hyper.res
langen$(EXE_EXTENSION): langen.cpp language-??.cpp language-ptbr.cpp
- $(CXX) -O0 $(CXXFLAGS) $(langen_CXXFLAGS) langen.cpp $(LDFLAGS) -o $@
+ $(CXX) $(CXXFLAGS) $(langen_CXXFLAGS) langen.cpp $(LDFLAGS) -o $@
makeh$(EXE_EXTENSION): makeh.cpp
- $(CXX) -O2 makeh.cpp -o $@
+ $(CXX) $(CXXFLAGS) makeh.cpp $(LDFLAGS) -o $@
autohdr.h: makeh$(EXE_EXTENSION) language-data.cpp *.cpp
./makeh classes.cpp locations.cpp colors.cpp hyperpoint.cpp geometry.cpp goldberg.cpp init.cpp floorshapes.cpp cell.cpp multi.cpp shmup.cpp pattern2.cpp mapeditor.cpp graph.cpp textures.cpp hprint.cpp language.cpp util.cpp complex.cpp *.cpp > autohdr.h
@@ -160,10 +142,10 @@ language-data.cpp: langen$(EXE_EXTENSION)
./langen > language-data.cpp
savepng$(OBJ_EXTENSION): savepng.cpp
- $(CXX) -O2 $(CXXFLAGS) -c savepng.cpp -o $@
+ $(CXX) $(CXXFLAGS) -c savepng.cpp -o $@
mymake$(EXE_EXTENSION): mymake.cpp
- $(CXX) -O2 $(CXXFLAGS) mymake.cpp -pthread -o $@
+ $(CXX) $(CXXFLAGS) mymake.cpp $(LDFLAGS) -pthread -o $@
emscripten: hyper.html
|
