Update of /cvsroot/jsmooth/jsmooth/skeletons/autodownload
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv18649
Modified Files:
Makefile.win main.cpp
Log Message:
Changed the command line arguments for the ResourceManager refactoring
Index: main.cpp
===================================================================
RCS file: /cvsroot/jsmooth/jsmooth/skeletons/autodownload/main.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** main.cpp 4 Apr 2007 19:47:08 -0000 1.6
--- main.cpp 28 Apr 2007 08:50:44 -0000 1.7
***************
*** 75,80 ****
// Note that this overwrites an existing KEY_ARGUMENTS
std::vector<std::string> args = StringUtils::split(lpszArgument, " \t\n\r", "\"'", false);
- for (int i=0; i<args.size(); i++)
- args[i] = StringUtils::fixArgumentString(args[i]);
globalResMan->setUserArguments( args );
}
--- 75,78 ----
Index: Makefile.win
===================================================================
RCS file: /cvsroot/jsmooth/jsmooth/skeletons/autodownload/Makefile.win,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Makefile.win 1 Apr 2007 22:18:05 -0000 1.3
--- Makefile.win 28 Apr 2007 08:50:44 -0000 1.4
***************
*** 17,22 ****
FLTK-CXXFLAGS = $(shell fltk-config --cxxflags)
##LINKLIBS = ../commonjava/CommonJava.a ../util-core/util-core.a mspack.a ../util-net/util-net.a
! LINKLIBS = ../commonjava/CommonJava.a ../util-core/util-core.a ../util-net/util-net.a
! LIBS = -L"$(MINGW)/lib" -L"/lib" -lws2_32 -L"/lib" -L"../commonjava" -mwindows -L"../util-core" $(LINKLIBS) $(FLTK-LDFLAGS) -lsetupapi
INCS = -I"$(MINGW)/include" -I"$(JDK)/include" -I"$(JDK)/include/win32"
CXXINCS = -I"$(MINGW)/include/c++" -I"$(MINGW)/include/c++/mingw32" -I"$(MINGW)/include/c++/backward" -I"$(MINGW)/include" -I"$(JDK)/include" -I"$(JDK)/include/win32" -I"../commonjava" -I"../util-core" -I"../util-net" $(FLTK-CXXFLAGS)
--- 17,22 ----
FLTK-CXXFLAGS = $(shell fltk-config --cxxflags)
##LINKLIBS = ../commonjava/CommonJava.a ../util-core/util-core.a mspack.a ../util-net/util-net.a
! LINKLIBS = ../commonjava/CommonJava.a ../util-net/util-net.a ../util-core/util-core.a
! LIBS = -L. -L"$(MINGW)/lib" -L"/lib" -lws2_32 -L"/lib" -L"../commonjava" -mwindows -L"../util-core" -L"../util-net" $(LINKLIBS) $(FLTK-LDFLAGS) -lsetupapi
INCS = -I"$(MINGW)/include" -I"$(JDK)/include" -I"$(JDK)/include/win32"
CXXINCS = -I"$(MINGW)/include/c++" -I"$(MINGW)/include/c++/mingw32" -I"$(MINGW)/include/c++/backward" -I"$(MINGW)/include" -I"$(JDK)/include" -I"$(JDK)/include/win32" -I"../commonjava" -I"../util-core" -I"../util-net" $(FLTK-CXXFLAGS)
***************
*** 33,37 ****
$(BIN): $(LINKOBJ) $(LINKLIBS)
! $(CPP) $(LINKOBJ) -o $(BIN) $(LIBS)
#mspack.a: $(libmscabd_la_SOURCES)
--- 33,37 ----
$(BIN): $(LINKOBJ) $(LINKLIBS)
! $(CPP) $(CXXFLAGS) $(LINKOBJ) $(LIBS) -o $(BIN)
#mspack.a: $(libmscabd_la_SOURCES)
|
