Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion Alice
Submodule Alice updated from bdba4c to 91eff9
2 changes: 1 addition & 1 deletion Demos/DemoDependencyPlugin/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ if(SOLIDRENDER_WIN)
elseif(SOLIDRENDER_LINUX)
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR})
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR})
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_BINDIR})
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_BINDIR}/Plugins)
endif()


Expand Down
2 changes: 1 addition & 1 deletion Demos/DemoPlugin/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ if(SOLIDRENDER_WIN)
elseif(SOLIDRENDER_LINUX)
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR})
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR})
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_BINDIR})
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_BINDIR}/Plugins)
endif()


Expand Down
23 changes: 0 additions & 23 deletions Designer/DB/SolidDesignerModel/SolidDesignerModel.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,32 +12,9 @@
#define SOLIDDESIGNER_MODEL_EXPORT __attribute__((visibility("default")))
#endif

namespace
{
void InitTest()
{
int i = 0;
std::cout << "Here is init test..." << std::endl;
}

void UnInitTest()
{
int i = 0;
std::cout << "Here is uninit test..." << std::endl;
}
}


extern "C" void InitializePlugin()
{
InitTest();
}


extern "C" void UnInitializePlugin()
{
UnInitTest();
}



Loading