Skip to content

Commit cfebc6b

Browse files
committed
Make change to Makefile.
1 parent b44a8fc commit cfebc6b

4 files changed

Lines changed: 17 additions & 9 deletions

File tree

demos/video/chapel-webcam/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ CPP_LDFLAGS = -Llib -lsmol -L$(CHPL_RUNTIME_LIB)/darwin/llvm/arm64/cpu-native/lo
5151

5252
# $(CHPL_LINKER) $(CHPL_CFLAGS) -o main main.cpp $(CHPL_LDFLAGS)
5353

54-
maincpp.o: main.cpp
54+
maincpp.o: main.cpp smol_wrapper.h
5555
$(CHPL_COMPILER) $(CHPL_CFLAGS) -fPIC main.cpp -o maincpp.o $(CHPL_LDFLAGS)
5656
$(CHPL_COMPILER) $(CHPL_CFLAGS) -fPIC main.cpp -o maincpp $(CHPL_LDFLAGS)
5757

demos/video/chapel-webcam/lib/smol.h

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,9 @@
22
#include "wctype.h"
33
#include "ctype.h"
44

5-
#ifdef __cplusplus
6-
extern "C" {
7-
#endif
85

96
void chpl__init_smol(int64_t _ln,
107
int32_t _fn);
118
int64_t square(int64_t x);
129
int64_t sumArray(chpl_external_array * a);
1310
void printArray(chpl_external_array * a);
14-
15-
#ifdef __cplusplus
16-
}
17-
#endif

demos/video/chapel-webcam/main.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#include "lib/smol.h"
1+
#include "smol_wrapper.h"
22

33
int main(int argc, char* argv[]) {
44
chpl_library_init(argc, argv);
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
#pragma once
2+
3+
#include "stdchpl.h"
4+
#include "wctype.h"
5+
#include "ctype.h"
6+
7+
#ifdef __cplusplus
8+
extern "C" {
9+
#endif
10+
11+
#include "lib/smol.h"
12+
13+
#ifdef __cplusplus
14+
}
15+
#endif

0 commit comments

Comments
 (0)