Added more makefiles; fixed some samples for Cygwin
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1654 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -1,61 +1,16 @@
|
||||
#
|
||||
# File: makefile.g95
|
||||
# Author: Julian Smart
|
||||
# Created: 1996
|
||||
# Updated:
|
||||
# File: makefile.g95
|
||||
# Author: Julian Smart
|
||||
# Created: 1999
|
||||
# Updated:
|
||||
# Copyright: (c) Julian Smart, 1999
|
||||
#
|
||||
# "%W% %G%"
|
||||
#
|
||||
# Makefile for Tex2RTF (GNU-WIN32)
|
||||
# Makefile for wxWindows sample (Cygwin/Mingw32).
|
||||
|
||||
WXDIR = ../../..
|
||||
|
||||
# All common UNIX compiler flags and options are now in
|
||||
# this central makefile.
|
||||
include $(WXDIR)/src/makeg95.env
|
||||
TARGET=tex2rtf
|
||||
OBJECTS = $(TARGET).o texutils.o tex2any.o htmlutil.o rtfutils.o xlputils.o table.o readshg.o
|
||||
|
||||
OBJECTS = $(OBJDIR)/tex2rtf.$(OBJSUFF) $(OBJDIR)/texutils.$(OBJSUFF) $(OBJDIR)/tex2any.$(OBJSUFF)\
|
||||
$(OBJDIR)/htmlutil.$(OBJSUFF) $(OBJDIR)/rtfutils.$(OBJSUFF) $(OBJDIR)/xlputils.$(OBJSUFF)\
|
||||
$(OBJDIR)/table.$(OBJSUFF) $(OBJDIR)/readshg.$(OBJSUFF)\
|
||||
$(OBJDIR)/tex2rtf_resources.$(OBJSUFF)
|
||||
include $(WXDIR)/src/makeprog.g95
|
||||
|
||||
all: $(OBJDIR) tex2rtf$(GUISUFFIX)$(EXESUFF)
|
||||
|
||||
INC = $(COMPPATHS) -I$(WXDIR)/include/msw -I$(WXDIR)/include/base -I../../wxhelp/src
|
||||
CPPFLAGS = $(XINCLUDE) $(INC) $(OPTIONS) $(GUI) -DDEBUG='$(DEBUG)' $(DEBUGFLAGS) $(WARN) $(OPT)
|
||||
|
||||
$(OBJDIR):
|
||||
mkdir $(OBJDIR)
|
||||
|
||||
tex2rtf$(GUISUFFIX)$(EXESUFF): $(OBJECTS) $(WXLIB)
|
||||
$(CC) $(LDFLAGS) -o tex2rtf$(GUISUFFIX)$(EXESUFF) $(OBJECTS) $(LDLIBS)
|
||||
|
||||
$(OBJDIR)/tex2rtf.$(OBJSUFF): tex2rtf.$(SRCSUFF) tex2rtf.h tex2any.h
|
||||
$(CC) -c $(CPPFLAGS) -o $@ tex2rtf.$(SRCSUFF)
|
||||
|
||||
$(OBJDIR)/texutils.$(OBJSUFF): texutils.$(SRCSUFF) tex2rtf.h tex2any.h
|
||||
$(CC) -c $(CPPFLAGS) -o $@ texutils.$(SRCSUFF)
|
||||
|
||||
$(OBJDIR)/tex2any.$(OBJSUFF): tex2any.$(SRCSUFF) tex2any.h
|
||||
$(CC) -c $(CPPFLAGS) -o $@ tex2any.$(SRCSUFF)
|
||||
|
||||
$(OBJDIR)/htmlutil.$(OBJSUFF): htmlutil.$(SRCSUFF) tex2any.h
|
||||
$(CC) -c $(CPPFLAGS) -o $@ htmlutil.$(SRCSUFF)
|
||||
|
||||
$(OBJDIR)/rtfutils.$(OBJSUFF): rtfutils.$(SRCSUFF) tex2any.h
|
||||
$(CC) -c $(CPPFLAGS) -o $@ rtfutils.$(SRCSUFF)
|
||||
|
||||
$(OBJDIR)/xlputils.$(OBJSUFF): xlputils.$(SRCSUFF) tex2any.h
|
||||
$(CC) -c $(CPPFLAGS) -o $@ xlputils.$(SRCSUFF)
|
||||
|
||||
$(OBJDIR)/table.$(OBJSUFF): table.$(SRCSUFF) tex2any.h
|
||||
$(CC) -c $(CPPFLAGS) -o $@ table.$(SRCSUFF)
|
||||
|
||||
$(OBJDIR)/readshg.$(OBJSUFF): readshg.$(SRCSUFF) readshg.h
|
||||
$(CC) -c $(CPPFLAGS) -o $@ readshg.$(SRCSUFF)
|
||||
|
||||
$(OBJDIR)/tex2rtf_resources.o: tex2rtf.rc
|
||||
$(RESCOMP) -i tex2rtf.rc -o $(OBJDIR)/tex2rtf_resources.o $(RESFLAGS)
|
||||
|
||||
clean:
|
||||
rm -f $(OBJECTS) tex2rtf$(GUISUFFIX).exe core *.rsc *.res
|
||||
|
@@ -402,11 +402,11 @@ void WriteTexReferences(char *filename)
|
||||
|
||||
void ReadTexReferences(char *filename)
|
||||
{
|
||||
#if !wxUSE_IOSTREAMH && __WXMSW__
|
||||
if (!wxFileExists(filename))
|
||||
return;
|
||||
|
||||
ifstream istr(filename, ios::in);
|
||||
#else
|
||||
ifstream istr(filename, ios::nocreate | ios::in);
|
||||
#endif
|
||||
|
||||
if (istr.bad()) return;
|
||||
|
||||
char label[100];
|
||||
@@ -569,12 +569,11 @@ void BibReadValue(istream& istr, char *buffer, bool ignoreBraces = TRUE,
|
||||
|
||||
bool ReadBib(char *filename)
|
||||
{
|
||||
if (!wxFileExists(filename))
|
||||
return FALSE;
|
||||
|
||||
char buf[300];
|
||||
#if !wxUSE_IOSTREAMH && __WXMSW__
|
||||
ifstream istr(filename, ios::in);
|
||||
#else
|
||||
ifstream istr(filename, ios::nocreate | ios::in);
|
||||
#endif
|
||||
if (istr.bad()) return FALSE;
|
||||
|
||||
BibLine = 1;
|
||||
@@ -1291,11 +1290,11 @@ char *RegisterSetting(char *settingName, char *settingValue, bool interactive)
|
||||
|
||||
bool ReadCustomMacros(char *filename)
|
||||
{
|
||||
#if !wxUSE_IOSTREAMH && __WXMSW__
|
||||
if (!wxFileExists(filename))
|
||||
return FALSE;
|
||||
|
||||
ifstream istr(filename, ios::in);
|
||||
#else
|
||||
ifstream istr(filename, ios::nocreate | ios::in);
|
||||
#endif
|
||||
|
||||
if (istr.bad()) return FALSE;
|
||||
|
||||
CustomMacroList.Clear();
|
||||
|
Reference in New Issue
Block a user