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

mymake:: savepng now works like other modules, and is compiled with SDL2 if needed

Browse Source
This commit is contained in:
Zeno Rogue
2021-03-07 14:02:06 +01:00
parent 4de8e6507d
commit 77e673f6f1
2 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
mymake.cpp
View File

@@ -50,11 +50,11 @@ void set_linux() {
linker = "g++ -rdynamic -o hyper"; linker = "g++ -rdynamic -o hyper";
if(sdlver == 2) { if(sdlver == 2) {
opts = "-DFHS -DLINUX -I/usr/include/SDL2"; opts = "-DFHS -DLINUX -I/usr/include/SDL2";
libs = " savepng.o -lSDL2 -lSDL2_ttf -lSDL2_mixer -lSDL2_gfx -lGLEW -lGL -lpng -rdynamic -lpthread -lz"; libs = " -lSDL2 -lSDL2_ttf -lSDL2_mixer -lSDL2_gfx -lGLEW -lGL -lpng -rdynamic -lpthread -lz";
} }
else { else {
opts = "-DFHS -DLINUX -I/usr/include/SDL"; opts = "-DFHS -DLINUX -I/usr/include/SDL";
libs = " savepng.o -lSDL -lSDL_ttf -lSDL_mixer -lSDL_gfx -lGLEW -lGL -lpng -rdynamic -lpthread -lz"; libs = " -lSDL -lSDL_ttf -lSDL_mixer -lSDL_gfx -lGLEW -lGL -lpng -rdynamic -lpthread -lz";
} }
} }
@@ -63,7 +63,7 @@ void set_mac() {
compiler = "g++ -march=native -W -Wall -Wextra -pedantic -Wno-unused-parameter -Wno-implicit-fallthrough -c"; compiler = "g++ -march=native -W -Wall -Wextra -pedantic -Wno-unused-parameter -Wno-implicit-fallthrough -c";
linker = "g++ -o hyper"; linker = "g++ -o hyper";
opts = "-DMAC -I/usr/local/include"; opts = "-DMAC -I/usr/local/include";
libs = " savepng.o -L/usr/local/lib -framework AppKit -framework OpenGL -lSDL -lSDLMain -lSDL_gfx -lSDL_mixer -lSDL_ttf -lpng -lpthread -lz"; libs = " -L/usr/local/lib -framework AppKit -framework OpenGL -lSDL -lSDLMain -lSDL_gfx -lSDL_mixer -lSDL_ttf -lpng -lpthread -lz";
} }
void set_mingw64() { void set_mingw64() {
@@ -72,7 +72,7 @@ void set_mingw64() {
compiler = "g++ -mwindows -march=native -W -Wall -Wextra -Werror -Wno-unused-parameter -Wno-implicit-fallthrough -Wno-maybe-uninitialized -c"; compiler = "g++ -mwindows -march=native -W -Wall -Wextra -Werror -Wno-unused-parameter -Wno-implicit-fallthrough -Wno-maybe-uninitialized -c";
linker = "g++ -o hyper"; linker = "g++ -o hyper";
opts = "-DWINDOWS -DCAP_GLEW=1 -DCAP_PNG=1"; opts = "-DWINDOWS -DCAP_GLEW=1 -DCAP_PNG=1";
libs = " savepng.o hyper.res -lopengl32 -lSDL -lSDL_gfx -lSDL_mixer -lSDL_ttf -lpthread -lz -lglew32 -lpng"; libs = " hyper.res -lopengl32 -lSDL -lSDL_gfx -lSDL_mixer -lSDL_ttf -lpthread -lz -lglew32 -lpng";
setvbuf(stdout, NULL, _IONBF, 0); // MinGW is quirky with output buffering setvbuf(stdout, NULL, _IONBF, 0); // MinGW is quirky with output buffering
} }
@@ -129,7 +129,7 @@ int main(int argc, char **argv) {
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 savepng.o"); retval = system("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;
} }
@@ -272,6 +272,8 @@ int main(int argc, char **argv) {
} }
} }
modules.push_back("savepng");
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(system(compiler + " -DREM " + opts + " " + obj_dir + "/hyper.cpp -c -o " + obj_dir + "/hyper.o")) { printf("error\n"); exit(1); }

11
savepng.cpp
View File

@@ -4,7 +4,18 @@
* This code is free software, available under zlib/libpng license. * This code is free software, available under zlib/libpng license.
* http://www.libpng.org/pub/png/src/libpng-LICENSE.txt * http://www.libpng.org/pub/png/src/libpng-LICENSE.txt
*/ */
#ifdef CAP_SDL
#if CAP_SDL
#define USE_SDL2
#endif
#endif
#ifdef USE_SDL2
#include <SDL2/SDL.h>
#else
#include <SDL/SDL.h> #include <SDL/SDL.h>
#endif
#include <png.h> #include <png.h>
#define SUCCESS 0 #define SUCCESS 0