mirror of
https://github.com/gryf/wmaker.git
synced 2025-12-19 12:28:22 +01:00
fixed compile problems
This commit is contained in:
@@ -105,4 +105,4 @@ INCLUDES = -I$(top_srcdir)/wrlib -I$(top_srcdir)/src \
|
|||||||
|
|
||||||
|
|
||||||
wcolorpanel.o: wcolorpanel.c
|
wcolorpanel.o: wcolorpanel.c
|
||||||
$(COMPILE) -c -DRGBTXT="@X_LIBRARY_PATH@/X11/rgb.txt" $<
|
$(COMPILE) -c -DRGBTXT="\"@X_LIBRARY_PATH@/X11/rgb.txt\"" $<
|
||||||
|
|||||||
@@ -89,6 +89,7 @@ XGETTEXT = @XGETTEXT@
|
|||||||
XLFLAGS = @XLFLAGS@
|
XLFLAGS = @XLFLAGS@
|
||||||
XLIBS = @XLIBS@
|
XLIBS = @XLIBS@
|
||||||
X_EXTRA_LIBS = @X_EXTRA_LIBS@
|
X_EXTRA_LIBS = @X_EXTRA_LIBS@
|
||||||
|
X_LIBRARY_PATH = @X_LIBRARY_PATH@
|
||||||
wprefsdir = @wprefsdir@
|
wprefsdir = @wprefsdir@
|
||||||
|
|
||||||
AUTOMAKE_OPTIONS = no-dependencies
|
AUTOMAKE_OPTIONS = no-dependencies
|
||||||
@@ -548,6 +549,9 @@ installdirs mostlyclean-generic distclean-generic clean-generic \
|
|||||||
maintainer-clean-generic clean mostlyclean distclean maintainer-clean
|
maintainer-clean-generic clean mostlyclean distclean maintainer-clean
|
||||||
|
|
||||||
|
|
||||||
|
wcolorpanel.o: wcolorpanel.c
|
||||||
|
$(COMPILE) -c -DRGBTXT="\"@X_LIBRARY_PATH@/X11/rgb.txt\"" $<
|
||||||
|
|
||||||
# Tell versions [3.59,3.63) of GNU make to not export all variables.
|
# Tell versions [3.59,3.63) of GNU make to not export all variables.
|
||||||
# Otherwise a system limit (for SysV at least) may be exceeded.
|
# Otherwise a system limit (for SysV at least) may be exceeded.
|
||||||
.NOEXPORT:
|
.NOEXPORT:
|
||||||
|
|||||||
@@ -89,6 +89,7 @@ XGETTEXT = @XGETTEXT@
|
|||||||
XLFLAGS = @XLFLAGS@
|
XLFLAGS = @XLFLAGS@
|
||||||
XLIBS = @XLIBS@
|
XLIBS = @XLIBS@
|
||||||
X_EXTRA_LIBS = @X_EXTRA_LIBS@
|
X_EXTRA_LIBS = @X_EXTRA_LIBS@
|
||||||
|
X_LIBRARY_PATH = @X_LIBRARY_PATH@
|
||||||
wprefsdir = @wprefsdir@
|
wprefsdir = @wprefsdir@
|
||||||
|
|
||||||
resdatadir = $(datadir)/WINGs
|
resdatadir = $(datadir)/WINGs
|
||||||
|
|||||||
@@ -33,7 +33,7 @@ W_ReadConfigurations(void)
|
|||||||
WMGetUDStringForKey(defaults, "BoldSystemFont");
|
WMGetUDStringForKey(defaults, "BoldSystemFont");
|
||||||
|
|
||||||
WINGsConfiguration.useMultiByte =
|
WINGsConfiguration.useMultiByte =
|
||||||
WMGetUDStringForKey(defaults, "MultiByteText");
|
WMGetUDBoolForKey(defaults, "MultiByteText");
|
||||||
|
|
||||||
WINGsConfiguration.doubleClickDelay =
|
WINGsConfiguration.doubleClickDelay =
|
||||||
WMGetUDIntegerForKey(defaults, "DoubleClickTime");
|
WMGetUDIntegerForKey(defaults, "DoubleClickTime");
|
||||||
|
|||||||
@@ -327,7 +327,7 @@ dnl ===========================================
|
|||||||
|
|
||||||
AC_PATH_XTRA
|
AC_PATH_XTRA
|
||||||
|
|
||||||
X_LIBRARY_PATH=$x_library
|
X_LIBRARY_PATH=$x_libraries
|
||||||
|
|
||||||
XCFLAGS="$X_CFLAGS"
|
XCFLAGS="$X_CFLAGS"
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user