mirror of
https://github.com/QB64-Phoenix-Edition/QB64pe.git
synced 2024-07-03 12:21:20 +00:00
Merge branch 'main' of https://github.com/a740g/QB64PE
This commit is contained in:
commit
bb8bd56689
|
@ -6606,7 +6606,6 @@ int32 selectfont(int32 f, img_struct *im) {
|
|||
int32 nmodes = 0;
|
||||
int32 anymode = 0;
|
||||
|
||||
float x_scale = 1, y_scale = 1;
|
||||
int32 x_offset = 0, y_offset = 0;
|
||||
int32 x_limit = 0, y_limit = 0;
|
||||
|
||||
|
@ -23960,17 +23959,20 @@ void sub__mousemove(float x, float y) {
|
|||
if (y2 > sy - 1)
|
||||
goto error;
|
||||
}
|
||||
|
||||
// x2,y2 are pixel co-ordinates
|
||||
// adjust for fullscreen position as necessary:
|
||||
x2 *= x_scale;
|
||||
y2 *= y_scale;
|
||||
x2 += x_offset;
|
||||
y2 += y_offset;
|
||||
x2 *= environment_2d__screen_x_scale;
|
||||
y2 *= environment_2d__screen_y_scale;
|
||||
x2 += environment_2d__screen_x1;
|
||||
y2 += environment_2d__screen_y1;
|
||||
|
||||
while (!window_exists) {
|
||||
Sleep(100);
|
||||
}
|
||||
glutWarpPointer(x2, y2);
|
||||
return;
|
||||
|
||||
error:
|
||||
error(5);
|
||||
#endif
|
||||
|
|
|
@ -5,8 +5,8 @@
|
|||
CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "qb64pe.manifest"
|
||||
|
||||
1 VERSIONINFO
|
||||
FILEVERSION 3,1,0,0
|
||||
PRODUCTVERSION 3,1,0,0
|
||||
FILEVERSION 3,2,0,0
|
||||
PRODUCTVERSION 3,2,0,0
|
||||
BEGIN
|
||||
BLOCK "StringFileInfo"
|
||||
BEGIN
|
||||
|
@ -14,13 +14,13 @@ BEGIN
|
|||
BEGIN
|
||||
VALUE "CompanyName","QB64 Phoenix Edition\0"
|
||||
VALUE "FileDescription","QB64 IDE and Compiler\0"
|
||||
VALUE "FileVersion","3,1,0,0\0"
|
||||
VALUE "FileVersion","3,2,0,0\0"
|
||||
VALUE "InternalName","qb64pe.bas\0"
|
||||
VALUE "LegalCopyright","MIT\0"
|
||||
VALUE "LegalTrademarks","\0"
|
||||
VALUE "OriginalFilename","qb64pe.exe\0"
|
||||
VALUE "ProductName","QB64-PE\0"
|
||||
VALUE "ProductVersion","3,1,0,0\0"
|
||||
VALUE "ProductVersion","3,2,0,0\0"
|
||||
VALUE "Comments","QB64 is a modern extended BASIC programming language that retains QB4.5/QBasic compatibility and compiles native binaries for Windows, Linux and macOS.\0"
|
||||
VALUE "Web","\0"
|
||||
END
|
||||
|
|
|
@ -7,7 +7,7 @@ if(!qbevent)break;evnt(24,1,"version.bas");}while(r);
|
|||
do{
|
||||
if(!qbevent)break;evnt(24,2,"version.bas");}while(r);
|
||||
do{
|
||||
qbs_set(__STRING_VERSION,qbs_new_txt_len("3.1.0",5));
|
||||
qbs_set(__STRING_VERSION,qbs_new_txt_len("3.2.0",5));
|
||||
qbs_cleanup(qbs_tmp_base,0);
|
||||
if(!qbevent)break;evnt(24,4,"version.bas");}while(r);
|
||||
S_4:;
|
||||
|
|
|
@ -15,7 +15,7 @@ goto downloadfinished
|
|||
|
||||
:download64choice
|
||||
choice /C 12 /M "Do you prefer to download 1)32-bit QB64-PE or 2)64-bit QB64-PE"
|
||||
if errorlevel == 1 goto download32
|
||||
if %errorlevel% == 1 goto download32
|
||||
set MINGW=mingw64.exe
|
||||
|
||||
:downloadfinished
|
||||
|
|
|
@ -1,9 +1,9 @@
|
|||
DIM SHARED Version AS STRING
|
||||
DIM SHARED IsCiVersion AS _BYTE
|
||||
|
||||
Version$ = "3.1.0"
|
||||
$VERSIONINFO:FileVersion#=3,1,0,0
|
||||
$VERSIONINFO:ProductVersion#=3,1,0,0
|
||||
Version$ = "3.2.0"
|
||||
$VERSIONINFO:FileVersion#=3,2,0,0
|
||||
$VERSIONINFO:ProductVersion#=3,2,0,0
|
||||
|
||||
' If ./internal/version.txt exist, then this is some kind of CI build with a label
|
||||
If _FILEEXISTS("internal/version.txt") THEN
|
||||
|
|
Loading…
Reference in a new issue