diff options
author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2023-04-27 14:23:39 +0200 |
---|---|---|
committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2023-04-27 14:23:39 +0200 |
commit | 9b94209f53782ecaf7084722ce90836573ceb86b (patch) | |
tree | 42354553aeeb29d9490a3120f0c5cd687cbad370 /nx-X11/config/cf/X11.rules | |
parent | 91d9218c0cc659f40918af6ac6c035c6c48d2c6d (diff) | |
parent | 16f6803f1597788b3bebcfa15e8900d8420b54a4 (diff) | |
download | nx-libs-9b94209f53782ecaf7084722ce90836573ceb86b.tar.gz nx-libs-9b94209f53782ecaf7084722ce90836573ceb86b.tar.bz2 nx-libs-9b94209f53782ecaf7084722ce90836573ceb86b.zip |
Merge branch 'uli42-pr/various9' into 3.6.x
Attributes GH PR #1029: https://github.com/ArcticaProject/nx-libs/pull/1029
Diffstat (limited to 'nx-X11/config/cf/X11.rules')
-rw-r--r-- | nx-X11/config/cf/X11.rules | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/nx-X11/config/cf/X11.rules b/nx-X11/config/cf/X11.rules index af3473c3a..932d3b5ff 100644 --- a/nx-X11/config/cf/X11.rules +++ b/nx-X11/config/cf/X11.rules @@ -6,9 +6,9 @@ # define X11IsTopLevelProject NO #endif -/* +/* * If no clues are given assume X11 is in the tree, otherwise - * UseInstalled overrides UseImports. Do not do both. + * UseInstalled overrides UseImports. Do not do both. */ #ifndef UseInstalledX11 # define UseInstalledX11 NO @@ -32,7 +32,7 @@ #if defined(X11ProjectRoot) # define XBinDir $(XPROJECTROOT)/lib/nx/bin -#elif defined(ProjectRoot) +#elif defined(ProjectRoot) # define XBinDir $(PROJECTROOT)/lib/nx/bin #else # define XBinDir $(BINDIR) @@ -75,7 +75,7 @@ #define LdPostLibs LdPostLib XLdPostLibs #ifndef TopXInclude -# if ImportX11 +# if ImportX11 # define TopXInclude -I$(TOP)/imports/x11/include # elif !UseInstalledX11 # define TopXInclude -I$(TOP)/exports/include @@ -126,6 +126,6 @@ #if XtransFailSoft # define XtransFailDefine /**/ -#else +#else # define XtransFailDefine -DFAIL_HARD #endif |