bizswan: update mingw solution and do a bit of warnings cleanup; still use msvs solution because it makes FASTER DULLS

This commit is contained in:
goyuken 2014-06-24 21:04:51 +00:00
parent 095f16baef
commit f73b4b5b77
7 changed files with 13 additions and 13 deletions

Binary file not shown.

View File

@ -30,7 +30,7 @@ Blip_Buffer::Blip_Buffer()
{ {
factor_ = (blip_u64)ULLONG_MAX; factor_ = (blip_u64)ULLONG_MAX;
offset_ = 0; offset_ = 0;
buffer_ = 0; buffer_ = nullptr;
buffer_size_ = 0; buffer_size_ = 0;
sample_rate_ = 0; sample_rate_ = 0;
reader_accum_ = 0; reader_accum_ = 0;
@ -127,7 +127,7 @@ Blip_Buffer::blargg_err_t Blip_Buffer::set_sample_rate( long new_rate, int msec
clear(); clear();
return 0; // success return nullptr; // success
} }
blip_resampled_time_t Blip_Buffer::clock_rate_factor( long rate ) const blip_resampled_time_t Blip_Buffer::clock_rate_factor( long rate ) const
@ -202,7 +202,7 @@ void Blip_Buffer::remove_samples( long count )
Blip_Synth_Fast_::Blip_Synth_Fast_() Blip_Synth_Fast_::Blip_Synth_Fast_()
{ {
buf = 0; buf = nullptr;
last_amp = 0; last_amp = 0;
delta_factor = 0; delta_factor = 0;
} }
@ -220,7 +220,7 @@ Blip_Synth_::Blip_Synth_( short* p, int w ) :
{ {
volume_unit_ = 0.0; volume_unit_ = 0.0;
kernel_unit = 0; kernel_unit = 0;
buf = 0; buf = nullptr;
last_amp = 0; last_amp = 0;
delta_factor = 0; delta_factor = 0;
} }

View File

@ -280,12 +280,12 @@ namespace MDFN_IEN_WSWAN
if (wsCartROM) if (wsCartROM)
{ {
std::free(wsCartROM); std::free(wsCartROM);
wsCartROM = 0; wsCartROM = nullptr;
} }
if (wsSRAM) if (wsSRAM)
{ {
std::free(wsSRAM); std::free(wsSRAM);
wsSRAM = 0; wsSRAM = nullptr;
} }
} }

View File

@ -1,7 +1,7 @@
CXX = g++ CXX = g++
CXXFLAGS = -Wall -DLSB_FIRST -I.. -Wno-multichar -O3 CXXFLAGS = -Wall -DLSB_FIRST -I.. -Wno-multichar -O3 -Wzero-as-null-pointer-constant -std=gnu++11 -fomit-frame-pointer -fno-exceptions
TARGET = bizswan.dll TARGET = bizswan.dll
LDFLAGS = -shared -static-libgcc -static-libstdc++ LDFLAGS = -shared -static-libgcc -static-libstdc++ $(CXXFLAGS)
RM = rm RM = rm
CP = cp CP = cp
@ -9,14 +9,13 @@ SRCS = \
../eeprom.cpp \ ../eeprom.cpp \
../gfx.cpp \ ../gfx.cpp \
../interrupt.cpp \ ../interrupt.cpp \
../main.cpp \
../memory.cpp \ ../memory.cpp \
../newstate.cpp \
../rtc.cpp \ ../rtc.cpp \
../sound.cpp \ ../sound.cpp \
../system.cpp \ ../system.cpp \
../tcache.cpp \ ../tcache.cpp \
../v30mz.cpp \ ../v30mz.cpp \
../newstate.cpp \
../Blip/Blip_Buffer.cpp ../Blip/Blip_Buffer.cpp
OBJS = $(SRCS:.cpp=.o) OBJS = $(SRCS:.cpp=.o)

View File

@ -60,7 +60,7 @@ namespace MDFN_IEN_WSWAN
if(Command == 0x15) if(Command == 0x15)
{ {
tm newtime; tm newtime;
uint64 now = userealtime ? time(0) : CurrentTime; uint64 now = userealtime ? time(nullptr) : CurrentTime;
GMTime(now, newtime); GMTime(now, newtime);
switch(wsCA15) switch(wsCA15)
@ -87,7 +87,7 @@ namespace MDFN_IEN_WSWAN
if (realtime) if (realtime)
{ {
userealtime = true; userealtime = true;
CurrentTime = time(0); CurrentTime = time(nullptr);
} }
else else
{ {

View File

@ -336,7 +336,7 @@ namespace MDFN_IEN_WSWAN
if(sbuf[i]) if(sbuf[i])
{ {
delete sbuf[i]; delete sbuf[i];
sbuf[i] = 0; sbuf[i] = nullptr;
} }
} }

View File

@ -465,6 +465,7 @@ namespace MDFN_IEN_WSWAN
POP(I.regs.w[CW]); POP(I.regs.w[CW]);
POP(I.regs.w[AW]); POP(I.regs.w[AW]);
CLK(8); CLK(8);
(void)tmp;
} OP_EPILOGUE; } OP_EPILOGUE;
OP( 0x62, i_chkind ) OP( 0x62, i_chkind )