A lot of changes with CrossBench. Created CUI, one fix in crossgen.hpp

This commit is contained in:
2015-06-12 20:51:47 +03:00
parent 34beee9850
commit 524e7b66da
6 changed files with 63 additions and 49 deletions

View File

@@ -2,18 +2,18 @@
## Auto Generated makefile by CodeLite IDE
## any manual changes will be erased
##
## Release
## Debug
ProjectName :=wxCrossGen
ConfigurationName :=Release
ConfigurationName :=Debug
WorkspacePath := "/data/Sync/SyncProjects/CrossGen"
ProjectPath := "/data/Sync/SyncProjects/CrossGen/wxCrossGen"
IntermediateDirectory :=../Release
IntermediateDirectory :=./Debug
OutDir := $(IntermediateDirectory)
CurrentFileName :=
CurrentFilePath :=
CurrentFileFullPath :=
User :=Aleksey Lobanov
Date :=11/06/15
Date :=12/06/15
CodeLitePath :="/home/alex/.codelite"
LinkerName :=/usr/bin/g++-4.8
SharedObjectLinkerName :=/usr/bin/g++-4.8 -shared -fPIC
@@ -28,14 +28,14 @@ LibraryPathSwitch :=-L
PreprocessorSwitch :=-D
SourceSwitch :=-c
OutputFile :=$(IntermediateDirectory)/$(ProjectName).out
Preprocessors :=$(PreprocessorSwitch)NDEBUG
Preprocessors :=
ObjectSwitch :=-o
ArchiveOutputSwitch :=
PreprocessOnlySwitch :=-E
ObjectsFileList :="wxCrossGen.txt"
PCHCompileFlags :=
MakeDirCommand :=mkdir -p
LinkOptions := -s $(shell wx-config --debug=no --libs --unicode=yes)
LinkOptions := $(shell wx-config --debug=yes --libs --unicode=yes)
IncludePath := $(IncludeSwitch). $(IncludeSwitch)../src
IncludePCH :=
RcIncludePath :=
@@ -50,8 +50,8 @@ LibPath := $(LibraryPathSwitch).
AR := /usr/bin/ar rcu
CXX := /usr/bin/g++-4.8
CC := /usr/bin/gcc-4.8
CXXFLAGS := -std=c++11 -O2 -Wall $(shell wx-config --cxxflags --unicode=yes --debug=no) $(Preprocessors)
CFLAGS := -O2 -Wall $(shell wx-config --cxxflags --unicode=yes --debug=no) $(Preprocessors)
CXXFLAGS := -std=c++11 -g -O0 -Wall $(shell wx-config --cxxflags --unicode=yes --debug=yes) $(Preprocessors)
CFLAGS := -g -O0 -Wall $(shell wx-config --cxxflags --unicode=yes --debug=yes) $(Preprocessors)
ASFLAGS :=
AS := /usr/bin/as
@@ -79,7 +79,7 @@ $(OutputFile): $(IntermediateDirectory)/.d $(Objects)
$(LinkerName) $(OutputSwitch)$(OutputFile) @$(ObjectsFileList) $(LibPath) $(Libs) $(LinkOptions)
$(IntermediateDirectory)/.d:
@test -d ../Release || $(MakeDirCommand) ../Release
@test -d ./Debug || $(MakeDirCommand) ./Debug
PreBuild:
@@ -101,6 +101,6 @@ $(IntermediateDirectory)/main.cpp$(PreprocessSuffix): main.cpp
## Clean
##
clean:
$(RM) -r ../Release/
$(RM) -r ./Debug/

View File

@@ -1 +1 @@
../Release/main.cpp.o
./Debug/main.cpp.o