mirror of
https://github.com/bsnes-emu/bsnes.git
synced 2025-09-02 17:33:15 +02:00
Update to v106r48 release.
byuu says: The problems with the Windows and Qt4 ports have all been resolved, although there's a fairly gross hack on a few Qt widgets to not destruct once Application::quit() is called to avoid a double free crash (I'm unsure where Qt is destructing the widgets internally.) The Cocoa port compiles again at least, though it's bound to have endless problems. I improved the Label painting in the GTK ports, which fixes the background color on labels inside TabFrame widgets. I've optimized the Makefile system even further. I added a "redo state" command to bsnes, which is created whenever you load the undo state. There are also hotkeys for both now, although I don't think they're really something you want to map hotkeys to. I moved the nall::Locale object inside hiro::Application, so that it can be used to translate the BrowserDialog and MessageDialog window strings. I improved the Super Game Boy emulation of `MLT_REQ`, fixing Pokemon Yellow's custom border and probably more stuff. Lots of other small fixes and improvements. Things are finally stable once again after the harrowing layout redesign catastrophe. Errata: - ICD::joypID should be set to 3 on reset(). joypWrite() may as well take uint1 instead of bool. - hiro/Qt: remove pWindow::setMaximumSize() comment; found a workaround for it - nall/GNUmakefile: don't set object.path if it's already set (allow overrides before including the file)
This commit is contained in:
@@ -31,21 +31,19 @@ ifeq ($(platform),)
|
||||
|
||||
# common commands
|
||||
ifeq ($(uname),)
|
||||
rm = $(info Deleting $1 ...) @del /q $(subst /,\,$1)
|
||||
rmdir = $(info Deleting $1 ...) @del /s /q $(subst /,\,$1) && if exist $(subst /,\,$1) (rmdir /s /q $(subst /,\,$1))
|
||||
delete = $(info Deleting $1 ...) @del /q $(subst /,\,$1)
|
||||
rdelete = $(info Deleting $1 ...) @del /s /q $(subst /,\,$1) && if exist $(subst /,\,$1) (rmdir /s /q $(subst /,\,$1))
|
||||
else
|
||||
rm = $(info Deleting $1 ...) @rm -f $1
|
||||
rmdir = $(info Deleting $1 ...) @rm -rf $1
|
||||
delete = $(info Deleting $1 ...) @rm -f $1
|
||||
rdelete = $(info Deleting $1 ...) @rm -rf $1
|
||||
endif
|
||||
endif
|
||||
|
||||
flags.c := -x c -std=c11
|
||||
flags.cpp := -x c++ -std=c++14
|
||||
flags.objc := -x objective-c -std=c11
|
||||
flags.objcpp := -x objective-c++ -std=c++14
|
||||
|
||||
flags :=
|
||||
options :=
|
||||
flags.c = -x c -std=c11
|
||||
flags.cpp = -x c++ -std=c++14
|
||||
flags.objc = -x objective-c -std=c11
|
||||
flags.objcpp = -x objective-c++ -std=c++14
|
||||
flags.deps = -MMD -MP -MF $(@:.o=.d)
|
||||
|
||||
# compiler detection
|
||||
ifeq ($(compiler),)
|
||||
@@ -135,16 +133,31 @@ endif
|
||||
|
||||
# paths
|
||||
prefix := $(HOME)/.local
|
||||
object.path := obj
|
||||
|
||||
# targets
|
||||
# rules
|
||||
default: all;
|
||||
verbose: information all;
|
||||
information:
|
||||
|
||||
nall.verbose:
|
||||
$(info Compiler Flags:)
|
||||
$(foreach n,$(sort $(call unique,$(flags))),$(if $(filter-out -I%,$n),$(info $([space]) $n)))
|
||||
$(info Linker Options:)
|
||||
$(foreach n,$(sort $(call unique,$(options))),$(if $(filter-out -l%,$n),$(info $([space]) $n)))
|
||||
|
||||
%.o: $<
|
||||
$(info Compiling $< ...)
|
||||
@$(call compile)
|
||||
|
||||
# function compile([arguments])
|
||||
compile = \
|
||||
$(strip \
|
||||
$(if $(filter %.c,$<), \
|
||||
$(compiler) $(flags.c) $(flags.deps) $(flags) $1 -c $< -o $@ \
|
||||
,$(if $(filter %.cpp,$<), \
|
||||
$(compiler) $(flags.cpp) $(flags.deps) $(flags) $1 -c $< -o $@ \
|
||||
)) \
|
||||
)
|
||||
|
||||
# function rwildcard(directory, pattern)
|
||||
rwildcard = \
|
||||
$(strip \
|
||||
|
Reference in New Issue
Block a user