mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-08-02 23:48:17 -07:00
56bd759df1
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
30 lines
828 B
Diff
30 lines
828 B
Diff
Index: OpenNI-9999/Platform/Linux/Build/OpenNI/Makefile
|
|
===================================================================
|
|
--- OpenNI-9999.orig/Platform/Linux/Build/OpenNI/Makefile
|
|
+++ OpenNI-9999/Platform/Linux/Build/OpenNI/Makefile
|
|
@@ -4,13 +4,11 @@ BIN_DIR = ../../Bin
|
|
|
|
INC_DIRS = \
|
|
../../../../Include \
|
|
- ../../../../Source \
|
|
- ../../../../Externals/TinyXml
|
|
+ ../../../../Source
|
|
|
|
SRC_FILES = \
|
|
../../../../Source/OpenNI/*.cpp \
|
|
- ../../../../Source/OpenNI/Linux/*.cpp \
|
|
- ../../../../Externals/TinyXml/*.cpp
|
|
+ ../../../../Source/OpenNI/Linux/*.cpp
|
|
|
|
ifeq ("$(OSTYPE)","Darwin")
|
|
INC_DIRS += /opt/local/include
|
|
@@ -19,7 +17,7 @@ ifeq ("$(OSTYPE)","Darwin")
|
|
endif
|
|
|
|
LIB_NAME = OpenNI
|
|
-USED_LIBS = usb-1.0 dl pthread
|
|
+USED_LIBS = usb-1.0 dl pthread tinyxml
|
|
ifneq ("$(OSTYPE)","Darwin")
|
|
USED_LIBS += rt
|
|
endif
|