Win32: Updated tools build and deployment

skyjake · Oct 14, 2012 · 62a9fc1 · 62a9fc1
1 parent b6bae24
commit 62a9fc1
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 9 deletions.
diff --git a/distrib/win32/setup.iss.template b/distrib/win32/setup.iss.template
@@ -63,6 +63,11 @@ Source: "bin\jDoom.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components:
 Source: "bin\jHeretic.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: Engine\jHeretic
 Source: "bin\jHexen.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: Engine\jHexen
 
+; Tools
+Source: "bin\md2tool.exe"; DestDir: "{app}\bin"; Flags: ignoreversion;
+Source: "bin\texc.exe"; DestDir: "{app}\bin"; Flags: ignoreversion;
+Source: "bin\wadtool.exe"; DestDir: "{app}\bin"; Flags: ignoreversion;
+
 ; Libraries
 Source: "..\win32\vcredist_x86.exe"; DestDir: "{app}\bin"; Flags: ignoreversion deleteafterinstall; Components: Engine
 Source: "bin\deng1.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: Engine
@@ -132,7 +137,7 @@ Name: "{group}\{cm:UninstallProgram,Doomsday Engine}"; Filename: "{uninstallexe}
 Name: "{userdesktop}\Doomsday Engine"; Filename: "{app}\snowberry\snowberry.exe"; WorkingDir: "{app}\snowberry"; Tasks: desktopicon; Flags: createonlyiffileexists
 
 [Run]
-Filename: "{app}\bin\vcredist_x86.exe"; Parameters: "/passive"; Flags: runascurrentuser
+Filename: "{app}\bin\vcredist_x86.exe"; Parameters: "/q"; Flags: runascurrentuser
 Filename: "{app}\snowberry\snowberry.exe"; Description: "{cm:LaunchProgram,Doomsday Engine}"; WorkingDir: "{app}\snowberry"; Flags: nowait postinstall skipifdoesntexist skipifsilent
 
 [UninstallDelete]

diff --git a/doomsday/config_win32.pri b/doomsday/config_win32.pri
@@ -18,6 +18,7 @@ DENG_EXPORT_LIB = $$OUT_PWD/../engine/doomsday.lib
 
 # Install locations:
 DENG_BASE_DIR = $$DENG_WIN_PRODUCTS_DIR
+DENG_BIN_DIR  = $$DENG_BASE_DIR/bin
 DENG_LIB_DIR  = $$DENG_BASE_DIR/bin
 DENG_DATA_DIR = $$DENG_BASE_DIR/data
 DENG_DOCS_DIR = $$DENG_BASE_DIR/doc

diff --git a/doomsday/engine/engine.pro b/doomsday/engine/engine.pro
@@ -745,7 +745,7 @@ win32 {
     # Windows installation.
     INSTALLS += target data startupdata startupgfx startupfonts license icon
 
-    target.path = $$DENG_LIB_DIR
+    target.path = $$DENG_BIN_DIR
 
     data.path = $$DENG_DATA_DIR
     startupdata.path = $$DENG_DATA_DIR

diff --git a/tools/md2tool/md2tool.pro b/tools/md2tool/md2tool.pro
@@ -8,6 +8,7 @@ TEMPLATE = app
 TARGET = md2tool
 
 CONFIG -= app_bundle
+win32: CONFIG += console
 QT -= core gui
 
 SOURCES += md2tool.c
@@ -17,6 +18,5 @@ HEADERS += md2tool.h anorms.h
 # Installation.
 !macx {
     INSTALLS += target
-    win32: target.path = $$DENG_WIN_PRODUCTS_DIR
-     else: target.path = $$DENG_BIN_DIR
+    target.path = $$DENG_BIN_DIR
 }
diff --git a/tools/texc/texc.pro b/tools/texc/texc.pro
@@ -8,6 +8,7 @@ TEMPLATE = app
 TARGET = texc
 
 CONFIG -= app_bundle
+win32: CONFIG += console
 QT -= core gui
 
 SOURCES += import.cpp texc.cpp
@@ -17,6 +18,5 @@ HEADERS += texc.h
 # Installation.
 !macx {
     INSTALLS += target
-    win32: target.path = $$DENG_WIN_PRODUCTS_DIR
-     else: target.path = $$DENG_BIN_DIR
+    target.path = $$DENG_BIN_DIR
 }
diff --git a/tools/wadtool/wadtool.c b/tools/wadtool/wadtool.c
@@ -94,7 +94,7 @@ void DestroyList(void)
 void CollectFiles(const char *basepath)
 {
 	long hFile;
-	struct finddata_s fd;
+    struct _finddata_t fd;
 	char findspec[256], path[256];
 
 	sprintf(findspec, "%s*.*", basepath);
@@ -190,7 +190,7 @@ int main(int argc, char **argv)
 	wadfile = argv[1];
 	if(argc > 2) prefix = argv[2];
 
-	srand(time(0));
+    srand((unsigned int)time(0));
 	rand();
 	rand();
 
@@ -260,4 +260,4 @@ int main(int argc, char **argv)
 stop_now:
 	DestroyList();
 	return 0;
-}
+}
diff --git a/tools/wadtool/wadtool.pro b/tools/wadtool/wadtool.pro
@@ -2,13 +2,24 @@
 # (c) 2012 Jaakko Keränen <jaakko.keranen@iki.fi>
 # License: GPL 2.0+
 
+include(../../doomsday/config.pri)
+
 TEMPLATE = app
 TARGET = wadtool
 
+win32: CONFIG += console
 QT -= core gui
 
 !win32: error("wadtool is currently only for Windows")
 
+DEFINES += _CRT_SECURE_NO_WARNINGS
+
 SOURCES += wadtool.c
 
 HEADERS += wadtool.h
+
+# Installation.
+!macx {
+    INSTALLS += target
+    target.path = $$DENG_BIN_DIR
+}