ShuriZma
/
stella
mirror of https://github.com/stella-emu/stella.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed configure/Makefile to work without patches in OpenBSD.

This commit is contained in:
Stephen Anthony 2018-06-06 18:23:27 -02:30
parent cf34707e27
commit 819850f971
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Changes.txt
View File

@ -24,6 +24,8 @@
* The Linux builds now use the system-installed PNG and ZLIB libraries * The Linux builds now use the system-installed PNG and ZLIB libraries
by default. by default.
* Fixed configure/build scripts to work natively under OpenBSD.
-Have fun! -Have fun!

4
Makefile
View File

@ -147,7 +147,7 @@ CXX_UPDATE_DEP_FLAG = -Wp,-MMD,"$(*D)/$(DEPDIR)/$(*F).d2"
.c.o: .c.o:
$(MKDIR) $(*D)/$(DEPDIR) $(MKDIR) $(*D)/$(DEPDIR)
$(CXX) $(CXX_UPDATE_DEP_FLAG) $(CXXFLAGS) $(CPPFLAGS) -c $(<) -o $*.o $(CC) $(CXX_UPDATE_DEP_FLAG) $(CXXFLAGS) $(CPPFLAGS) -c $(<) -o $*.o
$(ECHO) "$(*D)/" > $(*D)/$(DEPDIR)/$(*F).d $(ECHO) "$(*D)/" > $(*D)/$(DEPDIR)/$(*F).d
$(CAT) "$(*D)/$(DEPDIR)/$(*F).d2" >> "$(*D)/$(DEPDIR)/$(*F).d" $(CAT) "$(*D)/$(DEPDIR)/$(*F).d2" >> "$(*D)/$(DEPDIR)/$(*F).d"
$(RM) "$(*D)/$(DEPDIR)/$(*F).d2" $(RM) "$(*D)/$(DEPDIR)/$(*F).d2"
@ -162,7 +162,7 @@ else
.c.o: .c.o:
$(MKDIR) $(*D)/$(DEPDIR) $(MKDIR) $(*D)/$(DEPDIR)
$(CXX) $(CXX_UPDATE_DEP_FLAG) $(CXXFLAGS) $(CPPFLAGS) -c $(<) -o $*.o $(CC) $(CXX_UPDATE_DEP_FLAG) $(CXXFLAGS) $(CPPFLAGS) -c $(<) -o $*.o
endif endif
# Include the dependency tracking files. We add /dev/null at the end # Include the dependency tracking files. We add /dev/null at the end

2
configure vendored
View File

@ -578,7 +578,7 @@ if test "$_libpng" = auto ; then
#include <png.h> #include <png.h>
int main(void) { return printf("%s\n", PNG_HEADER_VERSION_STRING); } int main(void) { return printf("%s\n", PNG_HEADER_VERSION_STRING); }
EOF EOF
cc_check $LDFLAGS $CXXFLAGS $LIBPNG_CFLAGS $LIBPNG_LIBS -lpng && _libpng=yes cc_check $LDFLAGS $CXXFLAGS $LIBPNG_CFLAGS $LIBPNG_LIBS `pkg-config --libs libpng` && _libpng=yes
fi fi
if test "$_libpng" = yes ; then if test "$_libpng" = yes ; then
_zlib=auto _zlib=auto