diff --git a/Makefile b/Makefile index 4a70ec2bd..05cd63404 100644 --- a/Makefile +++ b/Makefile @@ -327,9 +327,11 @@ ifneq ($(filter y,$(DEP_HTTP)),) endif ifneq ($(OS),osx) - EXE_LIBS += $(QB_CORE_LIB) + EXE_LIBS += $(QB_CORE_LIB) $(GLEW_OBJS) LICENSE_IN_USE += freeglut +else + EXE_LIBS += $(GLEW_OBJS) endif ifeq ($(OS),win) diff --git a/internal/c/parts/core/build.mk b/internal/c/parts/core/build.mk index fc557614f..f84fdebfc 100644 --- a/internal/c/parts/core/build.mk +++ b/internal/c/parts/core/build.mk @@ -12,18 +12,18 @@ # Copy all .c files from the src directory into internal/c/parts/core/freeglut (after making QB64-PE specific changes) # Copy the include directory to internal/c/parts/core/freeglut -FREEGLUT_SRCS := \ - $(wildcard $(PATH_INTERNAL_C)/parts/core/freeglut/*.c) \ - $(wildcard $(PATH_INTERNAL_C)/parts/core/glew/*.c) +FREEGLUT_SRCS := $(wildcard $(PATH_INTERNAL_C)/parts/core/freeglut/*.c) +GLEW_SRCS := $(PATH_INTERNAL_C)/parts/core/glew/glew.c FREEGLUT_INCLUDE := -I$(PATH_INTERNAL_C)/parts/core/freeglut/include -I$(PATH_INTERNAL_C)/parts/core/glew/include FREEGLUT_OBJS := $(FREEGLUT_SRCS:.c=.o) +GLEW_OBJS := $(GLEW_SRCS:.c=.o) FREEGLUT_LIB := $(PATH_INTERNAL_C)/parts/core/freeglut.a $(PATH_INTERNAL_C)/parts/core/glew/%.o: $(PATH_INTERNAL_C)/parts/core/glew/%.c - $(CC) -O3 $(CFLAGS) $(FREEGLUT_INCLUDE) -DGLEW_STATIC -Wall $< -c -o $@ + $(CC) -O1 $(CFLAGS) $(FREEGLUT_INCLUDE) -DGLEW_STATIC -Wall $< -c -o $@ $(PATH_INTERNAL_C)/parts/core/freeglut/%.o: $(PATH_INTERNAL_C)/parts/core/freeglut/%.c $(CC) -O3 $(CFLAGS) $(FREEGLUT_INCLUDE) -DFREEGLUT_STATIC -Wall $< -c -o $@ @@ -35,4 +35,4 @@ QB_CORE_LIB := $(FREEGLUT_LIB) CXXFLAGS += $(FREEGLUT_INCLUDE) -CLEAN_LIST += $(FREEGLUT_LIB) $(FREEGLUT_OBJS) +CLEAN_LIST += $(FREEGLUT_LIB) $(FREEGLUT_OBJS) $(GLEW_OBJS)