mirror of
https://github.com/QB64-Phoenix-Edition/QB64pe.git
synced 2024-07-06 21:00:25 +00:00
Fix common dialogs build.mk bug
This commit is contained in:
parent
327d753206
commit
98e40c173d
6
Makefile
6
Makefile
|
@ -369,7 +369,7 @@ ifeq ($(OS),win)
|
|||
|
||||
LICENSE_IN_USE := $(filter-out freeglut,$(LICENSE_IN_USE))
|
||||
else
|
||||
CXXLIBS += -mwindows -lopengl32 -lglu32 -lwinmm
|
||||
CXXLIBS += -mwindows -lopengl32 -lglu32 -lwinmm -lcomdlg32 -lole32
|
||||
endif
|
||||
|
||||
ifneq ($(filter y,$(DEP_SOCKETS)),)
|
||||
|
@ -391,10 +391,6 @@ ifeq ($(OS),win)
|
|||
ifneq ($(filter y,$(DEP_ICON) $(DEP_ICON_RC) $(DEP_SCREENIMAGE) $(DEP_PRINTER)),)
|
||||
CXXLIBS += -lgdi32
|
||||
endif
|
||||
|
||||
ifneq ($(filter y,$(DEP_COMMON_DIALOGS)),)
|
||||
CXXLIBS += -lcomdlg32 -lole32
|
||||
endif
|
||||
endif
|
||||
|
||||
ifneq ($(filter y,$(DEP_DATA)),)
|
||||
|
|
|
@ -30,7 +30,7 @@ int32 func__display();
|
|||
void qbg_sub_view_print(int32, int32, int32);
|
||||
qbs *qbs_new(int32, uint8);
|
||||
qbs *qbs_new_txt(const char *);
|
||||
qbs *qbs_new_txt_len(const char *, int32_t); // a740g: Added this here for now so that we don't have to decare it ourselves everywhere
|
||||
qbs *qbs_new_txt_len(const char *, int32_t); // a740g: Added this here so that we don't have to declare it ourselves everywhere
|
||||
qbs *qbs_add(qbs *, qbs *);
|
||||
qbs *qbs_set(qbs *, qbs *);
|
||||
void qbg_sub_window(float, float, float, float, int32);
|
||||
|
|
|
@ -1,22 +1,25 @@
|
|||
|
||||
GUI_SRCS := \
|
||||
gui.cpp
|
||||
|
||||
TFD_SRCS := \
|
||||
tinyfiledialogs.c
|
||||
|
||||
GUI_OBJS := $(patsubst %.cpp,$(PATH_INTERNAL_C)/parts/gui/%.o,$(GUI_SRCS))
|
||||
GUI_SRCS := \
|
||||
gui.cpp
|
||||
|
||||
TFD_OBJS := $(patsubst %.c,$(PATH_INTERNAL_C)/parts/gui/%.o,$(TFD_SRCS))
|
||||
|
||||
$(PATH_INTERNAL_C)/parts/gui/%.o: $(PATH_INTERNAL_C)/parts/gui/%.cpp
|
||||
$(CXX) -O2 $(CXXFLAGS) -DDEPENDENCY_CONSOLE_ONLY -Wall $< -c -o $@
|
||||
GUI_OBJS := $(patsubst %.cpp,$(PATH_INTERNAL_C)/parts/gui/%.o,$(GUI_SRCS))
|
||||
|
||||
$(PATH_INTERNAL_C)/parts/gui/%.o: $(PATH_INTERNAL_C)/parts/gui/%.c
|
||||
$(CC) -O2 $(CFLAGS) -DDEPENDENCY_CONSOLE_ONLY -Wall $< -c -o $@
|
||||
|
||||
$(PATH_INTERNAL_C)/parts/gui/%.o: $(PATH_INTERNAL_C)/parts/gui/%.cpp
|
||||
$(CXX) -O2 $(CXXFLAGS) -DDEPENDENCY_CONSOLE_ONLY -Wall $< -c -o $@
|
||||
|
||||
# We'll use tdf to replace the libqb Alert & MessageBox stuff
|
||||
EXE_LIBS += $(TFD_OBJS)
|
||||
|
||||
ifdef DEP_COMMON_DIALOGS
|
||||
EXE_LIBS += $(GUI_OBJS) $(TFD_OBJS)
|
||||
EXE_LIBS += $(GUI_OBJS)
|
||||
endif
|
||||
|
||||
CLEAN_LIST += $(GUI_OBJS) $(TFD_OBJS)
|
||||
CLEAN_LIST += $(TFD_OBJS) $(GUI_OBJS)
|
||||
|
|
|
@ -29,7 +29,7 @@
|
|||
// We'll likely keep the 'include' this way because I do not want to duplicate stuff and cause issues
|
||||
// Matt is already doing work to separate and modularize libqb
|
||||
// So, this will be replaced with relevant stuff once that work is done
|
||||
#include "../../libqb.h"
|
||||
#include "../../../libqb.h"
|
||||
//-----------------------------------------------------------------------------------------------------
|
||||
|
||||
//-----------------------------------------------------------------------------------------------------
|
||||
|
|
Loading…
Reference in a new issue