Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- --- Makefile.orig Sun Jul 3 02:39:19 2022
- +++ Makefile Sun Jul 3 05:30:53 2022
- @@ -14,7 +14,7 @@
- #
- # This is important for libraries, since they could potentially be referencing
- # things from our dependencies
- -CXXFLAGS += $(CXXFLAGS_EXTRA)
- +CXXFLAGS += $(CXXFLAGS_EXTRA)
- CXXLIBS += $(CXXLIBS_EXTRA)
- # There are no C lib flags, those all go in CXXLIBS
- @@ -24,6 +24,9 @@
- EXE_LIBS :=
- ifeq ($(OS),lnx)
- + CXXFLAGS += -I/usr/local/include -I/usr/X11R6/include
- + CXXLIBS += -L/usr/local/lib -L/usr/X11R6/lib
- + CFLAGS += -I/usr/local/include -I/usr/X11R6/include
- lnx := y
- PATH_INTERNAL := ./internal
- @@ -31,6 +34,8 @@
- PATH_INTERNAL_TEMP := $(PATH_INTERNAL)/temp$(TEMP_ID)
- PATH_INTERNAL_C := $(PATH_INTERNAL)/c
- PATH_LIBQB := $(PATH_INTERNAL_C)/libqb
- + CXX := c++
- + CC := cc $(CFLAGS)
- CP := cp -r
- RM := rm -fr
- MKDIR := mkdir -p
- @@ -39,13 +44,10 @@
- PLATFORM := posix
- EXTENSION :=
- - # Check bitness by getting length of `long
- + # Check bitness
- # 64 bits on x86_64, 32 bits on x86
- - BITS := $(shell getconf LONG_BIT)
- + BITS := $(shell file -b /bin/cp | cut -b -6 | tr -cd [:digit:])
- - ifeq ($(BITS),)
- - BITS := 64
- - endif
- endif
- ifeq ($(OS),win)
- @@ -127,7 +129,7 @@
- CXXFLAGS += -w -std=gnu++11
- ifeq ($(OS),lnx)
- - CXXLIBS += -lGL -lGLU -lX11 -lpthread -ldl -lrt
- + CXXLIBS += -lGL -lGLU -lX11 -lpthread -ldl
- CXXFLAGS += -DFREEGLUT_STATIC
- endif
- --- internal/c/parts/core/src/freeglut_main.c.orig Sun Jul 3 04:42:36 2022
- +++ internal/c/parts/core/src/freeglut_main.c Sun Jul 3 04:44:47 2022
- @@ -43,6 +43,11 @@
- # define VFPRINTF(s,f,a)
- #endif
- +#ifdef __OpenBSD__
- +#include <sys/select.h> // fd_set
- +#endif
- +
- +
- int qb64_custom_event(int event,int v1,int v2,int v3,int v4,int v5,int v6,int v7,int v8,void *p1,void *p2);
- #if TARGET_HOST_POSIX_X11
- void qb64_os_event_linux(XEvent *event, Display *display, int *qb64_os_event_info);
- --- internal/c/libqb/include/libqb-common.h.orig Sun Jul 3 01:38:30 2022
- +++ internal/c/libqb/include/libqb-common.h Sun Jul 3 03:36:50 2022
- @@ -33,7 +33,7 @@
- # define QB64_MACOSX
- # define QB64_UNIX
- # define QB64_GCC
- -#elif defined(__linux__)
- +#elif defined(__unix__)
- # define QB64_LINUX
- # define QB64_UNIX
- # define QB64_GCC
- --- internal/source/main.txt.orig Sun Jul 3 01:38:32 2022
- +++ internal/source/main.txt Sun Jul 3 04:49:49 2022
- @@ -121845,7 +121845,7 @@
- if(!qbevent)break;evnt(25828,24,"build.bas");}while(r);
- }else{
- do{
- -qbs_set(_FUNC_GETMAKEEXECUTABLE_STRING_GETMAKEEXECUTABLE,qbs_new_txt_len("make",4));
- +qbs_set(_FUNC_GETMAKEEXECUTABLE_STRING_GETMAKEEXECUTABLE,qbs_new_txt_len("gmake",5));
- qbs_cleanup(qbs_tmp_base,0);
- if(!qbevent)break;evnt(25828,26,"build.bas");}while(r);
- }
- --- internal/c/os.h.orig Sun Jul 3 04:29:10 2022
- +++ internal/c/os.h Sun Jul 3 04:41:01 2022
- @@ -1,6 +1,13 @@
- #include "libqb-common.h"
- +#ifdef __OpenBSD__
- +#undef NULL
- +#define NULL 0
- +
- +#include <signal.h>
- +#endif
- +
- /* common types (not quite an include guard, but allows an including
- * file to not have these included.
- *
- --- setup_lnx.sh.orig Sun Jul 3 01:38:32 2022
- +++ setup_lnx.sh Sun Jul 3 01:55:04 2022
- @@ -1,4 +1,4 @@
- -#!/bin/bash
- +#!/usr/local/bin/bash
- # QB64 Installer
- # Argument 1: If not blank, qb64 will not be started after compilation
- @@ -109,8 +109,8 @@
- fi
- echo "Compiling and installing QB64..."
- -make clean
- -make OS=lnx BUILD_QB64=y -j3
- +gmake OS="lnx" clean
- +gmake OS="lnx" BUILD_QB64="y -j4"
- if [ -e "./qb64" ]; then
- echo "Done compiling!!"
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement