From f0dd5bc5f86eed519da2b710d8e504f21557ce61 Mon Sep 17 00:00:00 2001 From: sonoro1234 Date: Wed, 3 Oct 2018 11:37:33 +0200 Subject: [PATCH] Revert "Update README.md" This reverts commit 1a5e261a8e97d58b32a474779774eca9314c10d0. --- README.md | 1 - cimgui/Makefile | 8 +++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 0d40822..463aeb3 100644 --- a/README.md +++ b/README.md @@ -25,4 +25,3 @@ Notes: * [imgui-rs](https://github.com/Gekkio/imgui-rs) * [imgui-pas](https://github.com/dpethes/imgui-pas) * [odin-dear_imgui](https://github.com/ThisDrunkDane/odin-dear_imgui) -* [LuaJIT-ImGui](https://github.com/sonoro1234/LuaJIT-ImGui) diff --git a/cimgui/Makefile b/cimgui/Makefile index 0c72046..807a2c5 100644 --- a/cimgui/Makefile +++ b/cimgui/Makefile @@ -11,15 +11,13 @@ OBJS += ../imgui/imgui.o OBJS += ../imgui/imgui_draw.o OBJS += ../imgui/imgui_demo.o -CXXFLAGS=-O2 - UNAME_S := $(shell uname -s) ifeq ($(UNAME_S), Linux) #LINUX ECHO_MESSAGE = "Linux" OUTPUTNAME = cimgui.so - CXXFLAGS += -I../../ + CXXFLAGS = -I../../ CXXFLAGS += -Wall CXXFLAGS += -shared -fPIC CFLAGS = $(CXXFLAGS) @@ -29,7 +27,7 @@ ifeq ($(UNAME_S), Darwin) #APPLE ECHO_MESSAGE = "Mac OS X" OUTPUTNAME = cimgui.dylib - CXXFLAGS += -I/usr/local/include + CXXFLAGS = -I/usr/local/include CXXFLAGS += -Wall LINKFLAGS = -dynamiclib CFLAGS = $(CXXFLAGS) @@ -39,7 +37,7 @@ ifeq ($(OS), Windows_NT) ECHO_MESSAGE = "Windows" OUTPUTNAME = cimgui.dll - CXXFLAGS += -I../../ + CXXFLAGS = -I../../ CXXFLAGS += -Wall CXXFLAGS += -shared LINKFLAGS = -limm32