Skip to content

Commit 3f51aa6

Browse files
Fixing cfgpath on windows and specifying C linkage for binaries
1 parent f696cb7 commit 3f51aa6

File tree

3 files changed

+15
-4
lines changed

3 files changed

+15
-4
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,3 +60,4 @@ compile_commands.json
6060

6161
# Generated file
6262
Src/runcpp2/DefaultYAMLs.c
63+
Include/cfgpath.h

CMakeLists.txt

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,16 @@ endif()
5757

5858
add_subdirectory("${CMAKE_CURRENT_LIST_DIR}/External/System2")
5959

60+
# =========================================================================
61+
# cfgpath
62+
# =========================================================================
63+
64+
# Copy cfgpath.h
65+
configure_file( "${CMAKE_CURRENT_LIST_DIR}/External/cfgpath/cfgpath.h"
66+
"${CMAKE_CURRENT_LIST_DIR}/Include/cfgpath.h" COPYONLY)
67+
68+
69+
6070
# =========================================================================
6171
# runcpp2
6272
# =========================================================================

Src/runcpp2/ConfigParsing.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
#include "ssLogger/ssLog.hpp"
88

99

10-
extern const uint8_t DefaultCompilerProfiles[];
11-
extern const size_t DefaultCompilerProfiles_size;
12-
extern const uint8_t DefaultScriptDependencies[];
13-
extern const size_t DefaultScriptDependencies_size;
10+
extern "C" const uint8_t DefaultCompilerProfiles[];
11+
extern "C" const size_t DefaultCompilerProfiles_size;
12+
extern "C" const uint8_t DefaultScriptDependencies[];
13+
extern "C" const size_t DefaultScriptDependencies_size;
1414

1515
namespace
1616
{

0 commit comments

Comments
 (0)