Getting this building on my Linux box.

icculus · Sep 30, 2003 · 7463934 · 7463934
1 parent fdd3d90
commit 7463934
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/Makefile b/Makefile
@@ -1,22 +1,22 @@
 CXX = $(shell wx-config --cxx)
-PROGRAM = MojoMerge
+PROGRAM = mojomerge
 
 OBJECTS = Application.o CompareFilePanel.o CompareFilesUI.o \
 	CompareFolderPanel.o CompareFolders.o CompareFoldersUI.o Config.o \
 	ConfigUI.o DiffTextEdit.o FileMergeTransaction.o FolderHunk.o \
 	FolderMerge.o FolderMergeTransaction.o GNUDiff.o Hunk.o LineBuffer.o \
 	MainWindow.o Menu.o Merge.o SeparatorPanel.o TabBrowser.o \
-	Toolbar.o TransactionBuffer.o Test.o
+	Toolbar.o TransactionBuffer.o #Test.o
 
 .SUFFIXES:	.o .cpp
 
 .cpp.o :
-	$(CXX) -c `wx-config --cxxflags` -D_DEBUG -D__DEBUG__ -D__WXDEBUG__ -o $@ $<
+	$(CXX) -c `wx-config --cxxflags` -o $@ $<
 
 all:    $(PROGRAM)
 
 $(PROGRAM):	$(OBJECTS)
-	$(CXX) -o $(PROGRAM) $(OBJECTS) -lwx_gtkd_stc-2.4 `wx-config --libs`
+	$(CXX) -o $(PROGRAM) $(OBJECTS) /usr/local/lib/lib_stc-2.4.so `wx-config --libs`
 
 clean:
 	rm -f *.o $(PROGRAM)