Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

move simplex.h to be a public header #58

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

move simplex.h to be a public header #58

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ set(CCD_INCLUDES
ccd/compiler.h
ccd/ccd_export.h
ccd/quat.h
ccd/simplex.h
ccd/support.h
ccd/vec3.h
"${CMAKE_CURRENT_BINARY_DIR}/ccd/config.h")

Expand All @@ -34,9 +36,7 @@ set(CCD_SOURCES
mpr.c
polytope.c
polytope.h
simplex.h
support.c
support.h
vec3.c)

add_library(ccd ${CCD_INCLUDES} ${CCD_SOURCES})
Expand Down
4 changes: 2 additions & 2 deletions src/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ libccd_la_SOURCES = alloc.h \
list.h \
polytope.c polytope.h \
ccd/quat.h \
simplex.h \
support.c support.h \
ccd/simplex.h \
support.c ccd/support.h \
vec3.c ccd/vec3.h \
mpr.c

Expand Down
2 changes: 1 addition & 1 deletion src/ccd.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
#include <float.h>
#include <ccd/ccd.h>
#include <ccd/vec3.h>
#include "simplex.h"
#include <ccd/simplex.h>
#include "polytope.h"
#include "alloc.h"
#include "dbg.h"
Expand Down
2 changes: 1 addition & 1 deletion src/simplex.h → src/ccd/simplex.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
#define __CCD_SIMPLEX_H__

#include <ccd/compiler.h>
#include "support.h"
#include <ccd/support.h>

#ifdef __cplusplus
extern "C" {
Expand Down
0 src/support.h → src/ccd/support.h
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion src/mpr.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

#include <stdlib.h>
#include <ccd/ccd.h>
#include "simplex.h"
#include <ccd/simplex.h>
#include "dbg.h"

/** Finds origin (center) of Minkowski difference (actually it can be any
Expand Down
2 changes: 1 addition & 1 deletion src/polytope.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

#include <stdlib.h>
#include <stdio.h>
#include "support.h"
#include <ccd/support.h>
#include "list.h"

#ifdef __cplusplus
Expand Down
2 changes: 1 addition & 1 deletion src/support.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* See the License for more information.
*/

#include "support.h"
#include <ccd/support.h>

void __ccdSupport(const void *obj1, const void *obj2,
const ccd_vec3_t *_dir, const ccd_t *ccd,
Expand Down