mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2025-10-31 05:52:59 +00:00
Code Issues Releases Wiki Activity

fixed mymake with -DCAP_DAILY=1

Browse Source
This commit is contained in:
Zeno Rogue
2019-11-30 14:16:03 +01:00
parent 0f546c43a7
commit 411dffb601
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
mymake.cpp
View File

@@ -22,10 +22,10 @@ string opts = "-DFHS -DLINUX -DWHATEVER -I/usr/include/SDL";
string standard = " -std=c++11"; string standard = " -std=c++11";
string preprocessor = string preprocessor =
"g++ " + opts + " -E"; "g++ -E";
string compiler = string compiler =
"g++ " + opts + " -Wall -Wextra -Wno-maybe-uninitialized -Wno-missing-field-initializers -Wno-unused-parameter -Wno-implicit-fallthrough -rdynamic -fdiagnostics-color=always -c"; "g++ -Wall -Wextra -Wno-maybe-uninitialized -Wno-missing-field-initializers -Wno-unused-parameter -Wno-implicit-fallthrough -rdynamic -fdiagnostics-color=always -c";
string linker = string linker =
"g++ -rdynamic -o hyper"; "g++ -rdynamic -o hyper";
@@ -118,7 +118,7 @@ int main(int argc, char **argv) {
fsm.close(); fsm.close();
printf("preprocessing...\n"); printf("preprocessing...\n");
if(system(preprocessor + " "+obj_dir+"/hyper.cpp -o "+obj_dir+"/hyper.E")) { printf("preprocessing error\n"); exit(1); } if(system(preprocessor + " " + opts + " "+obj_dir+"/hyper.cpp -o "+obj_dir+"/hyper.E")) { printf("preprocessing error\n"); exit(1); }
if(true) { if(true) {
ifstream fs2(obj_dir+"/hyper.E"); ifstream fs2(obj_dir+"/hyper.E");
@@ -133,7 +133,7 @@ int main(int argc, char **argv) {
if(get_file_time(obj_dir + "/hyper.o") < get_file_time("hyper.cpp")) { if(get_file_time(obj_dir + "/hyper.o") < get_file_time("hyper.cpp")) {
printf("compiling hyper...\n"); printf("compiling hyper...\n");
if(system(compiler + " -DREM " + obj_dir + "/hyper.cpp -c -o " + obj_dir + "/hyper.o")) { printf("error\n"); exit(1); } if(system(compiler + " -DREM " + opts + " " + obj_dir + "/hyper.cpp -c -o " + obj_dir + "/hyper.o")) { printf("error\n"); exit(1); }
} }
string allobj = " " + obj_dir + "/hyper.o"; string allobj = " " + obj_dir + "/hyper.o";
@@ -153,7 +153,7 @@ int main(int argc, char **argv) {
time_t obj_time = get_file_time(obj); time_t obj_time = get_file_time(obj);
if(src_time > obj_time) { if(src_time > obj_time) {
printf("compiling %s... [%d/%d]\n", m.c_str(), id, int(modules.size())); printf("compiling %s... [%d/%d]\n", m.c_str(), id, int(modules.size()));
if(system(compiler + " " + src + " -o " + obj)) { printf("error\n"); exit(1); } if(system(compiler + " " + opts + " " + src + " -o " + obj)) { printf("error\n"); exit(1); }
} }
else { else {
printf("ok: %s\n", m.c_str()); printf("ok: %s\n", m.c_str());