parent
566187ffb4
commit
d6d5fdf9f1
|
@ -1,4 +1,5 @@
|
|||
build
|
||||
buildwin
|
||||
/vc/defaultconfig/scmrev.h
|
||||
/vc/.vs
|
||||
/vc/vc14_bin_Debug
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
|
||||
set OUTPUT_DIR=%1
|
||||
set OUTPUT_DIR=c:\Users\andyv\Downloads\fceux\buildwin
|
||||
|
||||
set OUTPUT_FILE=%OUTPUT_DIR%/fceux_git_info.cpp
|
||||
|
||||
|
|
|
@ -247,7 +247,7 @@ const uint8 cfi_data[] =
|
|||
|
||||
#define SET_BITS(target, target_bits, source, source_bits) target = set_bits(target, target_bits, get_bits(source, source_bits))
|
||||
|
||||
static inline uint8 string_to_bits(char* bitsstr, int* bits)
|
||||
static inline uint8 string_to_bits(const char bitsstr[], int* bits)
|
||||
{
|
||||
uint8 bit1, bit2, count = 0;
|
||||
for (int i = 0; i < 32; i++)
|
||||
|
@ -298,7 +298,7 @@ static inline uint8 string_to_bits(char* bitsstr, int* bits)
|
|||
return count;
|
||||
}
|
||||
|
||||
static inline uint32 get_bits(uint32 V, char* bitsstr)
|
||||
static inline uint32 get_bits(uint32 V, const char bitsstr[])
|
||||
{
|
||||
uint32 result = 0;
|
||||
int bits[32];
|
||||
|
@ -311,7 +311,7 @@ static inline uint32 get_bits(uint32 V, char* bitsstr)
|
|||
return result;
|
||||
}
|
||||
|
||||
static inline uint32 set_bits(uint32 V, char* bitsstr, uint32 new_bits)
|
||||
static inline uint32 set_bits(uint32 V, const char bitsstr[], uint32 new_bits)
|
||||
{
|
||||
int bits[32];
|
||||
uint8 count = string_to_bits(bitsstr, bits);
|
||||
|
|
|
@ -29,7 +29,7 @@
|
|||
#include "Qt/SplashScreen.h"
|
||||
#include "Qt/QtScriptManager.h"
|
||||
|
||||
#ifdef WIN32
|
||||
#if defined(WIN32) && (QT_VERSION_MAJOR < 6)
|
||||
#include <QtPlatformHeaders/QWindowsWindowFunctions>
|
||||
#endif
|
||||
|
||||
|
@ -159,7 +159,7 @@ int main( int argc, char *argv[] )
|
|||
// Need to wait for window to initialize before video init can be called.
|
||||
//consoleWindow->videoInit();
|
||||
|
||||
#ifdef WIN32
|
||||
#if defined(WIN32) && (QT_VERSION_MAJOR < 6)
|
||||
// This function is needed to fix the issue referenced below. It adds a 1-pixel border
|
||||
// around the fullscreen window due to some limitation in windows.
|
||||
// https://doc.qt.io/qt-5/windows-issues.html#fullscreen-opengl-based-windows
|
||||
|
|
Loading…
Reference in New Issue