Permalink
Browse files

Added project wide version setting in file version.

  • Loading branch information...
sritterbusch committed Apr 26, 2016
1 parent e7d3c41 commit 3028e89377c27dd25c69139b9c2195682761984f
Showing with 20 additions and 18 deletions.
  1. +1 −1 GUI-Release/src/subdir.mk
  2. +1 −1 Release/src/subdir.mk
  3. +16 −15 src/GuiMain.cpp
  4. +1 −1 src/OspacMain.cpp
  5. +1 −0 version
@@ -71,7 +71,7 @@ CPP_DEPS += \
src/%.o: ../src/%.cpp
@echo 'Building file: $<'
@echo 'Invoking: Cross G++ Compiler'
g++ -DGUI `fltk-config --cxxflags` -I/usr/local/include -O3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -o "$@" "$<"
g++ -DVERSION=\"`cat ../version`\" -DGUI `fltk-config --cxxflags` -I/usr/local/include -O3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -o "$@" "$<"
@echo 'Finished building: $<'
@echo ' '
View
@@ -71,7 +71,7 @@ CPP_DEPS += \
src/%.o: ../src/%.cpp
@echo 'Building file: $<'
@echo 'Invoking: Cross G++ Compiler'
g++ -DCLI -I/usr/local/include -O3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -o "$@" "$<"
g++ -DVERSION=\"`cat ../version`\" -DCLI -I/usr/local/include -O3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -o "$@" "$<"
@echo 'Finished building: $<'
@echo ' '
View
@@ -809,30 +809,31 @@ void run_callback(Fl_Widget* widget, void*)
int main(int argc, char **argv)
{
window = new Fl_Window(640,480,"Ospac - Open source podcast chain - Pre-1.0");
std::string title=SSTR("Ospac - Open source podcast chain - " << VERSION << " built " << __DATE__ << " " << __TIME__ );
window = new Fl_Window(640,480,title.c_str());
generalSettings(0,0,window->w()/2,window->h()/6);
generalSettings(0,0,window->w()/2,window->h()/6);
createTabs(0, window->h()/6, window->w(), window->h()*5/6-window->h()/8);
createTabs(0, window->h()/6, window->w(), window->h()*5/6-window->h()/8);
window->add_resizable(*tabs);
window->add_resizable(*tabs);
commandLine=new Fl_Multiline_Input(0,window->h()*7/8,window->w()*7/8,window->h()/8,"");
commandLine->wrap(1);
commandLine->readonly(1);
commandLine->textsize(9);
commandLine=new Fl_Multiline_Input(0,window->h()*7/8,window->w()*7/8,window->h()/8,"");
commandLine->wrap(1);
commandLine->readonly(1);
commandLine->textsize(9);
renderButton=new Fl_Button(window->w()*7/8,window->h()*7/8,window->w()/8,window->h()/8,"Run!");
renderButton->callback(run_callback);
renderButton=new Fl_Button(window->w()*7/8,window->h()*7/8,window->w()/8,window->h()/8,"Run!");
renderButton->callback(run_callback);
updateCommandLine();
updateCommandLine();
window->end();
window->end();
window->position((Fl::w() - window->w())/2, (Fl::h() - window->h())/2);
window->position((Fl::w() - window->w())/2, (Fl::h() - window->h())/2);
window->show(argc, argv);
return Fl::run();
window->show(argc, argv);
return Fl::run();
}
#endif
View
@@ -1196,7 +1196,7 @@ int main(int argc,char * argv[])
{
std::vector<std::string> arg;
LOG(logINFO) << "ospac 1.0 built " << __DATE__ << " " << __TIME__ << std::endl;
LOG(logINFO) << "ospac " << VERSION << " built " << __DATE__ << " " << __TIME__ << std::endl;
Log::setLoglevel(logDEBUG);
Log::setShowFunction(true);
View
@@ -0,0 +1 @@
pre-1.0

0 comments on commit 3028e89

Please sign in to comment.