-
Notifications
You must be signed in to change notification settings - Fork 22
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
cimplot_template: revert last changes and add include cimgui.h to cim…
…plot.h (issue #5)
- Loading branch information
1 parent
d65d6c7
commit 299d29f
Showing
2 changed files
with
3 additions
and
39 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,6 @@ | ||
|
||
|
||
#include "./implot/implot.h" | ||
#include "./implot/implot_internal.h" | ||
#include "cimplot.h" | ||
|
||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,44 +1,7 @@ | ||
#ifndef CIMGUIPLOT_INCLUDED | ||
#define CIMGUIPLOT_INCLUDED | ||
#include <stdio.h> | ||
#include <stdint.h> | ||
#if defined _WIN32 || defined __CYGWIN__ | ||
#ifdef CIMGUI_NO_EXPORT | ||
#define API | ||
#else | ||
#define API __declspec(dllexport) | ||
#endif | ||
#ifndef __GNUC__ | ||
#define snprintf sprintf_s | ||
#endif | ||
#else | ||
#ifdef __GNUC__ | ||
#define API __attribute__((__visibility__("default"))) | ||
#else | ||
#define API | ||
#endif | ||
#endif | ||
|
||
#if defined __cplusplus | ||
#define EXTERN extern "C" | ||
#else | ||
#include <stdarg.h> | ||
#include <stdbool.h> | ||
#define EXTERN extern | ||
#endif | ||
|
||
#define CIMGUI_API EXTERN API | ||
#define CONST const | ||
|
||
|
||
#ifdef _MSC_VER | ||
typedef unsigned __int64 ImU64; | ||
#else | ||
//typedef unsigned long long ImU64; | ||
#endif | ||
|
||
#include "./implot/implot.h" | ||
#include "./implot/implot_internal.h" | ||
#include "cimgui.h" | ||
This comment has been minimized.
Sorry, something went wrong.
This comment has been minimized.
Sorry, something went wrong.
sonoro1234
Author
Collaborator
|
||
|
||
#ifdef CIMGUI_DEFINE_ENUMS_AND_STRUCTS | ||
#include "imgui_structs.h" | ||
|
@sonoro1234 I think we should add a new
#ifdef
. Types likeImVec2
are defined in bothcimgui.h
andimgui.h
, there will be a name collision if we put the#include "cimgui.h"
here.