QB64/QB64-PE
QB64/QB64-PE
1
1
Fork 0
mirror of https://github.com/QB64-Phoenix-Edition/QB64pe.git synced 2024-07-03 15:51:20 +00:00
Code Issues Releases Wiki Activity

Merge branch 'main' into wiki-dev

Browse source
This commit is contained in:
Roland Heyder 2022-05-18 00:47:40 +02:00
parent acf9e0ff02 b44bd54db9
commit ea136c04bb
5 changed files with 29 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Makefile
View file

@ -84,8 +84,12 @@ else
endif endif
ifdef BUILD_QB64 ifdef BUILD_QB64
EXE ?= qb64 ifeq ($(OS),win)
else EXE ?= qb64.exe
else
EXE ?= qb64
endif
endif
ifneq ($(filter clean,$(MAKECMDGOALS)),) ifneq ($(filter clean,$(MAKECMDGOALS)),)
# We have to define this for the Makefile to work, # We have to define this for the Makefile to work,
@ -97,8 +101,6 @@ ifndef EXE
$(error Please provide executable name as 'EXE=executable') $(error Please provide executable name as 'EXE=executable')
endif endif
endif
all: $(EXE) all: $(EXE)
CLEAN_LIST := CLEAN_LIST :=
@ -341,6 +343,8 @@ clean:
$(EXE): $(EXE_OBJS) $(EXE_LIBS) $(EXE): $(EXE_OBJS) $(EXE_LIBS)
$(CXX) $(CXXFLAGS) $(EXE_OBJS) -o $@ $(EXE_LIBS) $(CXXLIBS) $(CXX) $(CXXFLAGS) $(EXE_OBJS) -o $@ $(EXE_LIBS) $(CXXLIBS)
ifneq ($(filter-out osx,$(OS)),)
$(OBJCOPY) --only-keep-debug $@ $(PATH_INTERNAL_TEMP)/$@.sym $(OBJCOPY) --only-keep-debug $@ $(PATH_INTERNAL_TEMP)/$@.sym
$(OBJCOPY) --strip-unneeded $@ $(OBJCOPY) --strip-unneeded $@
endif

33
internal/c/libqb.cpp
View file

@ -27355,19 +27355,11 @@ void sub__icon(int32 handle_icon, int32 handle_window_icon, int32 passed) {
#endif // DEPENDENCY_ICON #endif // DEPENDENCY_ICON
int32 func_screenwidth() { int32 func_screenwidth() {
#ifdef QB64_GLUT #ifdef QB64_WINDOWS
while (!window_exists) { return GetSystemMetrics(SM_CXSCREEN);
Sleep(100);
}
# ifdef QB64_WINDOWS
while (!window_handle) {
Sleep(100);
}
# endif
return glutGet(GLUT_SCREEN_WIDTH);
#else #else
# ifdef QB64_WINDOWS # ifdef QB64_GLUT
return GetSystemMetrics(0); return glutGet(GLUT_SCREEN_WIDTH);
# else # else
return 0; return 0;
# endif # endif
@ -27375,19 +27367,11 @@ int32 func_screenwidth() {
} }
int32 func_screenheight() { int32 func_screenheight() {
#ifdef QB64_GLUT #ifdef QB64_WINDOWS
while (!window_exists) { return GetSystemMetrics(SM_CYSCREEN);
Sleep(100);
}
# ifdef QB64_WINDOWS
while (!window_handle) {
Sleep(100);
}
# endif
return glutGet(GLUT_SCREEN_HEIGHT);
#else #else
# ifdef QB64_WINDOWS # ifdef QB64_GLUT
return GetSystemMetrics(1); return glutGet(GLUT_SCREEN_HEIGHT);
# else # else
return 0; return 0;
# endif # endif
@ -27400,6 +27384,7 @@ void sub_screenicon() {
Sleep(100); Sleep(100);
} }
# ifdef QB64_WINDOWS # ifdef QB64_WINDOWS
while (!window_handle) { while (!window_handle) {
Sleep(100); Sleep(100);
} }

BIN
internal/source/qb64.sym
View file

Binary file not shown.

BIN
internal/source/qb64_bootstrap.sym
View file

Binary file not shown.

14
setup_win.bat
View file

@ -19,8 +19,11 @@ echo Extracting %MINGW% as C++ Compiler
:skipccompsetup :skipccompsetup
internal\c\c_compiler\bin\mingw32-make.exe OS=win clean echo Cleaning...
internal\c\c_compiler\bin\mingw32-make.exe OS=win BUILD_QB64=y internal\c\c_compiler\bin\mingw32-make.exe OS=win clean >NUL 2>NUL
echo Building QB64...
internal\c\c_compiler\bin\mingw32-make.exe OS=win BUILD_QB64=y || goto report_error
echo. echo.
echo Launching 'QB64' echo Launching 'QB64'
@ -28,3 +31,10 @@ qb64
echo. echo.
pause pause
exit 0
report_error:
echo "Error compiling QB64."
echo "Please review above steps and report to https://github.com/QB64-Phoenix-Edition/QB64pe/issues if you can't get it to work"
exit 1