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/programs/Xserver/GL | |
| 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/programs/Xserver/GL')
| -rw-r--r-- | nx-X11/programs/Xserver/GL/Imakefile | 2 | ||||
| -rw-r--r-- | nx-X11/programs/Xserver/GL/mesa/swrast_setup/Imakefile.inc | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/nx-X11/programs/Xserver/GL/Imakefile b/nx-X11/programs/Xserver/GL/Imakefile index 19b5902a5..47dbf795c 100644 --- a/nx-X11/programs/Xserver/GL/Imakefile +++ b/nx-X11/programs/Xserver/GL/Imakefile @@ -27,7 +27,7 @@ DEFINES = $(GLX_DEFINES) MakeMutex($(SUBDIRS) $(OBJS) $(DONES)) #endif -#if HasGnuMake || HasBsdMake +#if HasGnuMake || HasBsdMake $(DONES): $(SUBDIRS) #endif diff --git a/nx-X11/programs/Xserver/GL/mesa/swrast_setup/Imakefile.inc b/nx-X11/programs/Xserver/GL/mesa/swrast_setup/Imakefile.inc index 567ad65b8..5d55a5855 100644 --- a/nx-X11/programs/Xserver/GL/mesa/swrast_setup/Imakefile.inc +++ b/nx-X11/programs/Xserver/GL/mesa/swrast_setup/Imakefile.inc @@ -1,7 +1,7 @@ MESASWRSETUPDIR = MesaSwrastSetupBuildDir MESA_SWR_SETUP_SRCS = $(MESASWRSETUPDIR)ss_context.c \ - $(MESASWRSETUPDIR)ss_triangle.c + $(MESASWRSETUPDIR)ss_triangle.c #ifdef NeedToLinkMesaSrc LinkSourceFile(ss_context.c, $(MESASRCDIR)/src/mesa/swrast_setup) @@ -13,18 +13,18 @@ LinkSourceFile(swrast_setup.h, $(MESASRCDIR)/src/mesa/swrast_setup) #endif MESA_SWR_SETUP_OBJS = $(MESASWRSETUPDIR)ss_context.o \ - $(MESASWRSETUPDIR)ss_triangle.o + $(MESASWRSETUPDIR)ss_triangle.o #if defined(DoSharedLib) && DoSharedLib MESA_SWR_SETUP_UOBJS = $(MESASWRSETUPDIR)unshared/ss_context.o \ - $(MESASWRSETUPDIR)unshared/ss_triangle.o + $(MESASWRSETUPDIR)unshared/ss_triangle.o #else MESA_SWR_SETUP_UOBJS = $(MESA_SWR_SETUP_OBJS) #endif MESA_SWR_SETUP_DOBJS = $(MESASWRSETUPDIR)debugger/ss_context.o \ - $(MESASWRSETUPDIR)debugger/ss_triangle.o + $(MESASWRSETUPDIR)debugger/ss_triangle.o MESA_SWR_SETUP_POBJS = $(MESASWRSETUPDIR)profiled/ss_context.o \ - $(MESASWRSETUPDIR)profiled/ss_triangle.o + $(MESASWRSETUPDIR)profiled/ss_triangle.o |