130 |
|
|
131 |
LIBS_flags += -ccopt "$(LDFLAGS) $(CPPFLAGS)" -cclib "$(LIBS)" |
LIBS_flags += -ccopt "$(LDFLAGS) $(CPPFLAGS)" -cclib "$(LIBS)" |
132 |
|
|
133 |
|
LIBS_flags += -ccopt "$(GTKCFLAGS) $(GTKLLIBS)" -cclib "$(GTKLFLAGS)" |
134 |
|
|
135 |
ifeq ("$(OS_FILES2)", "mingw") |
ifeq ("$(OS_FILES2)", "mingw") |
136 |
LIBS_flags += -ccopt "$(GTKCFLAGS) $(GTKLLIBS)" -cclib "$(GTKLFLAGS) -lws2_32 -lgdi32 -luser32 -ladvapi32 -lwsock32 -limm32 -lshell32 -lole32 resfile.o" |
LIBS_flags += -cclib "-lws2_32 -lgdi32 -luser32 -ladvapi32 -lwsock32 -limm32 -lshell32 -lole32 resfile.o" |
137 |
endif |
endif |
138 |
|
|
139 |
ifeq ("$(OS_FILES2)", "cygwin") |
ifeq ("$(OS_FILES2)", "cygwin") |
140 |
LIBS_flags += -ccopt "$(GTKCFLAGS) $(GTKLLIBS)" -cclib "$(GTKLFLAGS) -lws2_32 -lgdi32 -luser32 -ladvapi32 -lwsock32 -limm32 -lshell32 -lole32 resfile.o" |
LIBS_flags += -cclib "-lws2_32 -lgdi32 -luser32 -ladvapi32 -lwsock32 -limm32 -lshell32 -lole32 resfile.o" |
141 |
endif |
endif |
142 |
|
|
143 |
ifeq ("$(ZLIB)" , "yes") |
ifeq ("$(ZLIB)" , "yes") |
811 |
|
|
812 |
ifeq ("$(COMPILE_GUI)" , "yes") |
ifeq ("$(COMPILE_GUI)" , "yes") |
813 |
ifeq ("$(USE_GTK2)", "yes") |
ifeq ("$(USE_GTK2)", "yes") |
814 |
SUBDIRS += $(SRC_GUI) $(SRC_GUI)/win32 $(ICONS_CHOICE) +lablgtk2 |
SUBDIRS += $(SRC_GUI) $(SRC_GUI)/x11 $(SRC_GUI)/win32 $(ICONS_CHOICE) +lablgtk2 |
815 |
GTK_LIBS_byte=-I +lablgtk2 $(LABLGL_CMA) lablgtk.cma gtkInit.cmo lablrsvg.cma |
GTK_LIBS_byte=-I +lablgtk2 $(LABLGL_CMA) lablgtk.cma gtkInit.cmo lablrsvg.cma |
816 |
GTK_LIBS_opt=-I +lablgtk2 $(LABLGL_CMXA) lablgtk.cmxa gtkInit.cmx lablrsvg.cmxa |
GTK_LIBS_opt=-I +lablgtk2 $(LABLGL_CMXA) lablgtk.cmxa gtkInit.cmx lablrsvg.cmxa |
817 |
GTK_STATIC_LIBS_opt=-I +lablgtk2 lablgtk.cmxa gtkInit.cmx lablrsvg.cmxa |
GTK_STATIC_LIBS_opt=-I +lablgtk2 lablgtk.cmxa gtkInit.cmx lablrsvg.cmxa |
1187 |
$(SRC_GUI)/guiWindow.ml |
$(SRC_GUI)/guiWindow.ml |
1188 |
|
|
1189 |
ifeq ("$(OS_FILES2)", "mingw") |
ifeq ("$(OS_FILES2)", "mingw") |
1190 |
GTK2GUI_SRCS += $(SRC_GUI)/win32/systraystubs.c $(SRC_GUI)/win32/systray.ml |
GTK2GUI_SRCS += $(SRC_GUI)/win32/systraystubs.c |
1191 |
|
else |
1192 |
|
GTK2GUI_SRCS += $(SRC_GUI)/x11/eggtrayicon.c $(SRC_GUI)/x11/eggtrayicon.h $(SRC_GUI)/x11/systraystubs.c |
1193 |
endif |
endif |
1194 |
|
|
1195 |
GTK2GUI_SRCS += $(SRC_GUI)/guiMain.ml |
GTK2GUI_SRCS += \ |
1196 |
|
$(SRC_GUI)/guiSystray.ml \ |
1197 |
|
$(SRC_GUI)/guiMain.ml |
1198 |
|
|
1199 |
NEWGUI_SRCS= \ |
NEWGUI_SRCS= \ |
1200 |
$(SRC_PROGRESS)/gui_progress.ml \ |
$(SRC_PROGRESS)/gui_progress.ml \ |