mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2024-12-18 06:50:27 +00:00
Code Issues Releases Wiki Activity

mymake:: renamed system to mysystem (as it no longer just converts the type) and moved the implementation earlier

Browse Source
This commit is contained in:
Zeno Rogue 2021-03-11 09:16:42 +01:00
parent 7cc628fb55
commit a54c34ff99
1 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
mymake.cpp
View File

@ -38,6 +38,19 @@ bool mingw64 = false;
int sdlver = 1; int sdlver = 1;
int mysystem(string cmdline) {
if(verbose) {
printf("%s\n", cmdline.c_str());
}
if (mingw64)
cmdline = "sh -c '" + cmdline + "'"; // because system(arg) passes arg to cmd.exe on MinGW
return system(cmdline.c_str());
}
bool file_exists(string fname) {
return access(fname.c_str(), F_OK) != -1;
}
#if defined(MAC) #if defined(MAC)
string os = "mac"; string os = "mac";
#elif defined(WINDOWS) #elif defined(WINDOWS)
@ -116,25 +129,12 @@ int optimized = 0;
string obj_dir = "mymake_files"; string obj_dir = "mymake_files";
string setdir = "../"; string setdir = "../";
int system(string cmdline) {
if(verbose) {
printf("%s\n", cmdline.c_str());
}
if (mingw64)
cmdline = "sh -c '" + cmdline + "'"; // because system(arg) passes arg to cmd.exe on MinGW
return system(cmdline.c_str());
}
bool file_exists(string fname) {
return access(fname.c_str(), F_OK) != -1;
}
int main(int argc, char **argv) { int main(int argc, char **argv) {
set_os(os); set_os(os);
int retval = 0; // for storing return values of some function calls int retval = 0; // for storing return values of some function calls
for(string fname: {"Makefile.loc", "Makefile.simple", "Makefile"}) for(string fname: {"Makefile.loc", "Makefile.simple", "Makefile"})
if(file_exists(fname)) { if(file_exists(fname)) {
retval = system("make -f " + fname + " language-data.cpp autohdr.h"); retval = mysystem("make -f " + fname + " language-data.cpp autohdr.h");
if (retval) { printf("error during preparation!\n"); exit(retval); } if (retval) { printf("error during preparation!\n"); exit(retval); }
break; break;
} }
@ -244,7 +244,7 @@ int main(int argc, char **argv) {
compiler += " " + standard; compiler += " " + standard;
ifstream fs("hyper.cpp"); ifstream fs("hyper.cpp");
retval = system("mkdir -p " + obj_dir); retval = mysystem("mkdir -p " + obj_dir);
if (retval) { printf("unable to create output directory!\n"); exit(retval); } if (retval) { printf("unable to create output directory!\n"); exit(retval); }
ofstream fsm(obj_dir + "/hyper.cpp"); ofstream fsm(obj_dir + "/hyper.cpp");
@ -267,7 +267,7 @@ int main(int argc, char **argv) {
fsm.close(); fsm.close();
printf("preprocessing...\n"); printf("preprocessing...\n");
if(system(preprocessor + " " + opts + " "+obj_dir+"/hyper.cpp -o "+obj_dir+"/hyper.E")) { printf("preprocessing error\n"); exit(1); } if(mysystem(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");
@ -284,7 +284,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 " + opts + " " + obj_dir + "/hyper.cpp -c -o " + obj_dir + "/hyper.o")) { printf("error\n"); exit(1); } if(mysystem(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";
@ -306,7 +306,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) {
string cmdline = compiler + " " + opts + " " + src + " -o " + obj; string cmdline = compiler + " " + opts + " " + src + " -o " + obj;
pair<int, function<int(void)>> task(id, [cmdline]() { return system(cmdline); }); pair<int, function<int(void)>> task(id, [cmdline]() { return mysystem(cmdline); });
tasks.push_back(task); tasks.push_back(task);
} }
else { else {
@ -346,12 +346,12 @@ int main(int argc, char **argv) {
} this_thread::sleep_for(quantum); } } this_thread::sleep_for(quantum); }
if (mingw64) { if (mingw64) {
retval = system("windres hyper.rc -O coff -o hyper.res"); retval = mysystem("windres hyper.rc -O coff -o hyper.res");
if (retval) { printf("windres error!\n"); exit(retval); } if (retval) { printf("windres error!\n"); exit(retval); }
} }
printf("linking...\n"); printf("linking...\n");
retval = system(linker + allobj + libs); retval = mysystem(linker + allobj + libs);
if (retval) { printf("linking error!\n"); exit(retval); } if (retval) { printf("linking error!\n"); exit(retval); }
return 0; return 0;
} }