]>
Commit | Line | Data |
---|---|---|
1e59de90 TL |
1 | diff --git a/makefile.vc b/makefile.vc |
2 | index cd0fc5a..7ce6861 100644 | |
3 | --- a/makefile.vc | |
4 | +++ b/makefile.vc | |
5 | @@ -32,6 +32,12 @@ epsilon.lib: $(LIBOBJ) | |
6 | ||
7 | $(EPSILON_DLL): epsilon_i.lib | |
8 | ||
9 | +!IFNDEF DEBUG | |
10 | +POPTLIB=$(LIBPATH)popt.lib | |
11 | +!ELSE | |
12 | +POPTLIB=$(LIBPATH)poptd.lib | |
13 | +!ENDIF | |
14 | + | |
15 | epsilon_i.lib: $(LIBOBJ) | |
16 | link /debug /dll /def:libepsilon.def /out:$(EPSILON_DLL) \ | |
17 | /implib:epsilon_i.lib $(LIBOBJ) | |
18 | @@ -48,8 +54,8 @@ $(EPSILON_EXE): $(EPSILON_DLL) src\epsilon.obj \ | |
19 | src\cmd_truncate_file.obj src\cmd_decode_file.obj \ | |
20 | src\cmd_encode_file.obj src\misc.obj \ | |
21 | src\psi.obj src\pbm.obj \ | |
22 | - ..\popt\lib\libpopt.lib | |
23 | - /Fe$(EPSILON_EXE) | |
24 | + $(POPTLIB) \ | |
25 | + /Fe"$(EPSILON_EXE)" | |
26 | if exist $(EPSILON_EXE).manifest mt -manifest \ | |
27 | $(EPSILON_EXE).manifest -outputresource:$(EPSILON_EXE);1 | |
28 | ||
29 | @@ -71,8 +77,9 @@ install: all | |
30 | -mkdir $(INSTDIR)\bin | |
31 | -mkdir $(INSTDIR)\lib | |
32 | -mkdir $(INSTDIR)\include | |
33 | + -mkdir $(INSTDIR)\tools | |
34 | copy *.dll $(INSTDIR)\bin | |
35 | copy *.lib $(INSTDIR)\lib | |
36 | - copy *.exe $(INSTDIR)\bin | |
37 | + copy *.exe $(INSTDIR)\tools | |
38 | copy lib\epsilon.h $(INSTDIR)\include | |
39 | ||
40 | diff --git a/src/misc.h b/src/misc.h | |
41 | index 9023dce..d8ce602 100644 | |
42 | --- a/src/misc.h | |
43 | +++ b/src/misc.h | |
44 | @@ -30,7 +30,7 @@ extern "C" { | |
45 | #endif | |
46 | ||
47 | /* Use _snprintf instead of snprintf under MSVC compiler */ | |
48 | -#if defined(_WIN32) && !defined(__MINGW32__) | |
49 | +#if 0 | |
50 | #define snprintf _snprintf | |
51 | #endif | |
52 |