Merge pull request #20 from willfurnass/patch-2-0-13-building_on_linux
Building on Linux: #define DLL_EXPORT as the empty string and link to libm
This commit is contained in:
@@ -15,4 +15,4 @@ add_library(epanet STATIC ../../src/epanet.c ../../src/hydraul.c ../../src/hash
|
||||
# the standalone executable
|
||||
include_directories(../../src)
|
||||
add_executable(runepanet ../../run/main.c)
|
||||
target_link_libraries (runepanet LINK_PUBLIC epanet)
|
||||
target_link_libraries (runepanet LINK_PUBLIC epanet m)
|
||||
|
||||
@@ -47,6 +47,8 @@
|
||||
#else
|
||||
#define DLLEXPORT
|
||||
#endif
|
||||
#else
|
||||
#define DLLEXPORT
|
||||
#endif
|
||||
#endif
|
||||
|
||||
@@ -271,4 +273,4 @@ extern "C" {
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif //EPANET2_H
|
||||
#endif //EPANET2_H
|
||||
|
||||
Reference in New Issue
Block a user