3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-10-30 20:21:12 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Hopefully fixed compilation of the Shiny profiler on Linux,

Browse source 
where the Shiny profiler shall be disabled.
This commit is contained in:
bubnikv 2016-10-17 09:55:42 +02:00
parent 19312d0a1a
commit 52dc18e350
8 changed files with 24 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

6
xs/src/Shiny/ShinyMacros.h
View file

@ -27,7 +27,7 @@ THE SOFTWARE.
#include "ShinyManager.h"
#ifdef SHINY_IS_COMPILED
#if SHINY_IS_COMPILED == TRUE
/*---------------------------------------------------------------------------*/
/* public preprocessors */
@ -254,7 +254,7 @@ THE SOFTWARE.
/*---------------------------------------------------------------------------*/
#else /* #if SHINY_IS_COMPILED == TRUE */
#else /* if SHINY_IS_COMPILED == TRUE */
#ifdef __cplusplus
extern "C" {
@ -292,6 +292,6 @@ SHINY_INLINE ShinyData GetEmptyData() {
#define PROFILE_SET_ENABLED(boolean)
#endif
#endif /* SHINY_IS_COMPILED */
#endif /* SHINY_IS_COMPILED == TRUE */
#endif /* SHINY_MACROS_H */

2
xs/src/Shiny/ShinyManager.h
View file

@ -33,7 +33,7 @@ THE SOFTWARE.
#include <stdio.h>
#ifdef SHINY_IS_COMPILED
#if SHINY_IS_COMPILED == TRUE
#ifdef __cplusplus
extern "C" {

2
xs/src/Shiny/ShinyNode.h
View file

@ -28,7 +28,7 @@ THE SOFTWARE.
#include "ShinyData.h"
#include "ShinyTools.h"
#ifdef SHINY_IS_COMPILED
#if SHINY_IS_COMPILED == TRUE
#ifdef __cplusplus
extern "C" {

2
xs/src/Shiny/ShinyNodePool.h
View file

@ -27,7 +27,7 @@ THE SOFTWARE.
#include "ShinyNode.h"
#ifdef SHINY_IS_COMPILED
#if SHINY_IS_COMPILED == TRUE
#ifdef __cplusplus
extern "C" {

2
xs/src/Shiny/ShinyOutput.h
View file

@ -28,7 +28,7 @@ THE SOFTWARE.
#include "ShinyNode.h"
#include "ShinyZone.h"
#ifdef SHINY_IS_COMPILED
#if SHINY_IS_COMPILED == TRUE
#ifdef __cplusplus
extern "C" {

31
xs/src/Shiny/ShinyPrereqs.h
View file

@ -25,6 +25,20 @@ THE SOFTWARE.
#ifndef SHINY_PREREQS_H
#define SHINY_PREREQS_H
/*---------------------------------------------------------------------------*/
#ifndef FALSE
#define FALSE 0x0
#endif
#ifndef TRUE
#define TRUE 0x1
#endif
#ifndef NULL
#define NULL 0
#endif
#include "ShinyConfig.h"
#include "ShinyVersion.h"
@ -62,21 +76,6 @@ extern "C" {
#endif
/*---------------------------------------------------------------------------*/
#ifndef FALSE
#define FALSE 0x0
#endif
#ifndef TRUE
#define TRUE 0x1
#endif
#ifndef NULL
#define NULL 0
#endif
/*---------------------------------------------------------------------------*/
#if SHINY_COMPILER == SHINY_COMPILER_GNUC
@ -87,7 +86,7 @@ extern "C" {
/*---------------------------------------------------------------------------*/
#ifdef SHINY_IS_COMPILED
#if SHINY_IS_COMPILED == TRUE
struct _ShinyNode;
struct _ShinyZone;

2
xs/src/Shiny/ShinyTools.c
View file

@ -110,4 +110,4 @@ float ShinyGetTickInvFreq(void) {
#endif
#endif /* SHINY_IS_COMPILED */
#endif /* if SHINY_IS_COMPILED == TRUE */

2
xs/src/Shiny/ShinyZone.h
View file

@ -28,7 +28,7 @@ THE SOFTWARE.
#include "ShinyData.h"
#include <memory.h>
#ifdef SHINY_IS_COMPILED
#if SHINY_IS_COMPILED == TRUE
#ifdef __cplusplus
extern "C" {