]>
Commit | Line | Data |
---|---|---|
6ff9ccf9 AM |
1 | diff -urN boomerang.org/boomerang.cpp boomerang/boomerang.cpp |
2 | --- boomerang.org/boomerang.cpp 2004-07-09 00:22:50.488941368 +0200 | |
3 | +++ boomerang/boomerang.cpp 2004-07-09 00:37:52.418827184 +0200 | |
4 | @@ -212,20 +212,7 @@ | |
5 | int Boomerang::commandLine(int argc, const char **argv) | |
6 | { | |
7 | if (argc < 2) usage(); | |
8 | - progPath = argv[0]; | |
9 | - // Chop off after the last slash | |
10 | - size_t j = progPath.rfind("/"); | |
11 | - if (j == (size_t)-1) | |
12 | - j = progPath.rfind("\\"); | |
13 | - if (j != (size_t)-1) | |
14 | - { | |
15 | - // Do the chop; keep the trailing slash | |
16 | - progPath = progPath.substr(0, j+1); | |
17 | - } | |
18 | - else { | |
19 | - std::cerr << "? No slash in argv[0]!" << std::endl; | |
20 | - return 1; | |
21 | - } | |
87b75033 | 22 | + progPath = BOOMDIR "/"; |
6ff9ccf9 AM |
23 | outputPath = "./"; |
24 | ||
25 | // Parse switches on command line | |
87b75033 AM |
26 | diff -urN boomerang.org/Makefile.in boomerang/Makefile.in |
27 | --- boomerang.org/Makefile.in 2004-07-09 00:22:50.487941520 +0200 | |
28 | +++ boomerang/Makefile.in 2004-07-09 00:47:53.197494944 +0200 | |
29 | @@ -178,7 +178,7 @@ | |
30 | ||
31 | # Compile ordinary files | |
32 | $(STATIC_OBJS): %.o : %.cpp | |
33 | - $(CC) -c -o $@ -Iinclude $(EXTRA) $< | |
34 | + $(CC) -c -o $@ -Iinclude $(BOOMSET) $(EXTRA) $< | |
35 | ||
36 | $(TEST_OBJS): %.o : %.cpp | |
37 | $(CC) -c -o $@ -Iinclude $(EXTRA) $< |