Merge pull request #2 from tyler-dodge/master

Further linux compatibility
ajoslin · Dec 23, 2011 · cead255 · cead255
2 parents 573e334 + fc601a8
commit cead255
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/Makefile b/Makefile
@@ -12,7 +12,7 @@ lua=$(src)lua/
 view=$(src)view/
 util=$(src)util/
 genie=$(src)genie/
-libs=-llua `wx-config --cxxflags --libs`
+libs=-llua `wx-config --cxxflags --libs` -lz
 
 #all the source files
 genieFiles=$(genie)Condition.cpp $(genie)Effect.cpp $(genie)Trigger.cpp $(genie)Scenario.cpp 
@@ -30,7 +30,7 @@ objFiles=$(subst $(src),$(objs),$(srcFiles:.cpp=.o))
 
 #main compilation, final linking
 .PHONY: program
-program: $(objFiles)
+$(outName): $(objFiles)
 	g++ $(objFiles) $(libs) $(linker) -o $(outName)
 
 #Uses makefiles created by dependency generation for source files

diff --git a/src/view/LTPage_Script.cpp b/src/view/LTPage_Script.cpp
@@ -72,7 +72,7 @@ void LTPage_Script::onPickTargetCheckBoxChanged(wxCommandEvent &event)
 	else
 	{
 		pickTargetButton->Enable(true);
-		pickTargetButton->SetLabel("Browse...");
+		pickTargetButton->SetLabel(wxT("Browse..."));
 	}
 }
 
@@ -94,7 +94,7 @@ void LTPage_Script::setBaseScenario(wxFileName *fname)
 		baseScenario->Assign(fname->GetFullPath());
 
 	if (!fname->FileExists())
-		pickBaseComboBox->SetValue("None");
+	  pickBaseComboBox->SetValue(wxT("None"));
 	else
 		pickBaseComboBox->SetValue(fname->GetFullName());
 
@@ -125,7 +125,7 @@ void LTPage_Script::setTargetScenario(wxFileName *fname)
 void LTPage_Script::updatePickBaseComboBox()
 {
 	pickBaseComboBox->Clear();
-	pickBaseComboBox->Append("None", dummyScenFile);
+	pickBaseComboBox->Append(wxT("None"), dummyScenFile);
 	for (int i=0; i<frame->openFiles.size(); i++)
 		if (frame->openFiles[i]->getType()==FTYPE_Scenario)
 			pickBaseComboBox->Append(frame->openFiles[i]->file->GetFullName(), (wxClientData *)frame->openFiles[i]->file);
@@ -143,4 +143,4 @@ void LTPage_Script::write(wxFileName *fname)
 
 void LTPage_Script::read()
 {
-}
+}