Added some resources to the Windows DLL.
This commit is contained in:
parent
f7896848c2
commit
d18cd47a4b
|
@ -14,7 +14,8 @@ xHFILES = \
|
||||||
|
|
||||||
OFILES = \
|
OFILES = \
|
||||||
$(baseCFILES:%.c=$(OBJDIR)/%.o) \
|
$(baseCFILES:%.c=$(OBJDIR)/%.o) \
|
||||||
$(baseMFILES:%.m=$(OBJDIR)/%.o)
|
$(baseMFILES:%.m=$(OBJDIR)/%.o) \
|
||||||
|
$(baseRCFILES:%.rc=$(OBJDIR)/%.o)
|
||||||
|
|
||||||
xCFLAGS = \
|
xCFLAGS = \
|
||||||
-g \
|
-g \
|
||||||
|
@ -26,6 +27,11 @@ xCFLAGS = \
|
||||||
$(archmflag) \
|
$(archmflag) \
|
||||||
$(baseCFLAGS)
|
$(baseCFLAGS)
|
||||||
|
|
||||||
|
# windres doesn't support -m
|
||||||
|
xRCFLAGS = \
|
||||||
|
$(RCFLAGS) \
|
||||||
|
$(baseRCFLAGS)
|
||||||
|
|
||||||
xLDFLAGS = \
|
xLDFLAGS = \
|
||||||
-g \
|
-g \
|
||||||
$(LDFLAGS) \
|
$(LDFLAGS) \
|
||||||
|
@ -47,6 +53,10 @@ $(OBJDIR)/%.o: %.m $(xHFILES) | $$(dir $$@).phony
|
||||||
@$(CC) -o $@ -c $< $(xCFLAGS)
|
@$(CC) -o $@ -c $< $(xCFLAGS)
|
||||||
@echo ====== Compiled $<
|
@echo ====== Compiled $<
|
||||||
|
|
||||||
|
$(OBJDIR)/%.o: %.rc $(xHFILES) | $$(dir $$@).phony
|
||||||
|
@$(RC) $(xRCFLAGS) $< $@
|
||||||
|
@echo ====== Compiled $<
|
||||||
|
|
||||||
# see http://www.cmcrossroads.com/article/making-directories-gnu-make
|
# see http://www.cmcrossroads.com/article/making-directories-gnu-make
|
||||||
%/.phony:
|
%/.phony:
|
||||||
@mkdir -p $(dir $@)
|
@mkdir -p $(dir $@)
|
||||||
|
|
|
@ -36,11 +36,14 @@ baseCFILES = \
|
||||||
|
|
||||||
baseMFILES = $(osMFILES)
|
baseMFILES = $(osMFILES)
|
||||||
|
|
||||||
|
baseRCFILES = $(osRCFILES)
|
||||||
|
|
||||||
baseCFLAGS = $(osCFLAGS)
|
baseCFLAGS = $(osCFLAGS)
|
||||||
baseLDFLAGS = \
|
baseLDFLAGS = \
|
||||||
-shared \
|
-shared \
|
||||||
$(osLDWarnUndefinedFlags) \
|
$(osLDWarnUndefinedFlags) \
|
||||||
$(osLDFLAGS)
|
$(osLDFLAGS)
|
||||||
|
baseRCFLAGS = $(osRCFLAGS)
|
||||||
baseSUFFIX = $(osLIBSUFFIX)
|
baseSUFFIX = $(osLIBSUFFIX)
|
||||||
|
|
||||||
include GNUbase.mk
|
include GNUbase.mk
|
||||||
|
|
|
@ -33,8 +33,12 @@ osCFILES = \
|
||||||
windows/window.c
|
windows/window.c
|
||||||
|
|
||||||
osHFILES = \
|
osHFILES = \
|
||||||
|
windows/resources.h \
|
||||||
windows/uipriv_windows.h
|
windows/uipriv_windows.h
|
||||||
|
|
||||||
|
osRCFILES = \
|
||||||
|
windows/resources.rc
|
||||||
|
|
||||||
# thanks ebassi in irc.gimp.net/#gtk+
|
# thanks ebassi in irc.gimp.net/#gtk+
|
||||||
osCFLAGS = \
|
osCFLAGS = \
|
||||||
-D_UI_EXTERN='__declspec(dllexport) extern'
|
-D_UI_EXTERN='__declspec(dllexport) extern'
|
||||||
|
|
|
@ -0,0 +1,3 @@
|
||||||
|
// 30 may 2015
|
||||||
|
|
||||||
|
#define rcTabPageDialog 100
|
|
@ -0,0 +1,14 @@
|
||||||
|
// 30 may 2015
|
||||||
|
//TODO#include "winapi.h"
|
||||||
|
#include <windows.h>
|
||||||
|
|
||||||
|
// this is a UTF-8 file
|
||||||
|
#pragma code_page(65001)
|
||||||
|
|
||||||
|
// this is the dialog template used
|
||||||
|
rcTabPageDialog DIALOGEX 0, 0, 100, 100
|
||||||
|
STYLE WS_CHILD | WS_VISIBLE
|
||||||
|
// TODO EXSTYLE WS_EX_CONTROLPARENT
|
||||||
|
BEGIN
|
||||||
|
// nothing
|
||||||
|
END
|
|
@ -28,6 +28,7 @@
|
||||||
#include "../out/ui.h"
|
#include "../out/ui.h"
|
||||||
#include "../ui_windows.h"
|
#include "../ui_windows.h"
|
||||||
#include "../uipriv.h"
|
#include "../uipriv.h"
|
||||||
|
#include "resources.h"
|
||||||
|
|
||||||
// ui internal window messages
|
// ui internal window messages
|
||||||
enum {
|
enum {
|
||||||
|
|
Loading…
Reference in New Issue