Commit a3724e81 authored by David Llewellyn-Jones's avatar David Llewellyn-Jones

Updated code and build files to work on Windows.

parent 35e6875a
......@@ -286,7 +286,7 @@ bool ExportStepAnimatedBitmap (LongPollPersist * psLongPollData, void * psData)
FuncPersist * psFuncData;
FUNCTYPE eFuncType;
gchar * pData;
unsigned long int uSize;
gsize uSize;
struct zip_source * pzZipSource;
zip_int64_t nPosition;
bool boMemorySuccess;
......
......@@ -327,7 +327,7 @@ bool ExportManifestSVX (Recall * hFile, int nResolution, VisPersist * psVisData)
recprintf (hFile, "\t<metadata>\n");
recprintf (hFile, "\t\t<entry key=\"generatedBy\" value=\"functy\" />\n");
ulTime = (unsigned long)GetCurrentTime (psVisData);
ulTime = (unsigned long)GetCurrentVisTime (psVisData);
pTm = gmtime (& ulTime);
nLength = strftime (szTime, TIMESTRING_LEN, "%c", pTm);
if (nLength > 0) {
......
......@@ -2679,7 +2679,7 @@ void SetScreenBufferToScreen (VisPersist * psVisData) {
psVisData->uScreenBuffer = 0u;
}
double GetCurrentTime (VisPersist * psVisData) {
double GetCurrentVisTime (VisPersist * psVisData) {
return psVisData->fCurrentTime;
}
......
......@@ -128,7 +128,7 @@ int GetScreenWidth (VisPersist * psVisData);
bool ExportBitmap (char const * szFilename, char const * szType, int nHeight, int nWidth, VisPersist * psVisData);
void SetScreenBuffer (GLuint uBuffer, VisPersist * psVisData);
void SetScreenBufferToScreen (VisPersist * psVisData);
double GetCurrentTime (VisPersist * psVisData);
double GetCurrentVisTime (VisPersist * psVisData);
///////////////////////////////////////////////////////////////////
// Function definitions
......
@ECHO OFF
IF "%~1"=="" ECHO Error: Must specify a version number as a parameter. E.g. "build 1.0.0"
IF "%~1"=="" GOTO End
SET productversion=%1
REM Add -mconsole to both gcc calls for console output
cd src
del *.o
gcc -DFUNCTYDIR=\"./assets\" -c -Wall -mwindows -mms-bitfields -I"%GTK_BASEPATH%\include\gtk-2.0" -I"%GTK_BASEPATH%\include\cairo" -I"%GTK_BASEPATH%\include\glib-2.0" -I"%GTK_BASEPATH%\include\pango-1.0" -I"%GTK_BASEPATH%\lib\gtk-2.0\include" -I"%GTK_BASEPATH%\lib\glib-2.0\include" -I"%GTK_BASEPATH%\include\atk-1.0" -I"%GTK_BASEPATH%\include" -I"%GTK_BASEPATH%\include\gtkglext-1.0" -I"%GTK_BASEPATH%\lib\gtkglext-1.0\include" -I"%GTK_BASEPATH%\include\gdk-pixbuf-2.0" -I"..\..\freeglut\include" -I"..\..\GLee" -I"..\..\Symbolic\src" -I"..\..\libzip\lib" *.c
gcc -DFUNCTYDIR=\"./assets\" -DVERSION=\"%productversion%\" -c -Wall -mwindows -mms-bitfields -I"%GTK_BASEPATH%\include\gtk-2.0" -I"%GTK_BASEPATH%\include\cairo" -I"%GTK_BASEPATH%\include\glib-2.0" -I"%GTK_BASEPATH%\include\pango-1.0" -I"%GTK_BASEPATH%\lib\gtk-2.0\include" -I"%GTK_BASEPATH%\lib\glib-2.0\include" -I"%GTK_BASEPATH%\include\atk-1.0" -I"%GTK_BASEPATH%\include" -I"%GTK_BASEPATH%\include\gtkglext-1.0" -I"%GTK_BASEPATH%\lib\gtkglext-1.0\include" -I"%GTK_BASEPATH%\include\gdk-pixbuf-2.0" -I"..\..\freeglut\include" -I"..\..\GLee" -I"..\..\Symbolic\src" -I"..\..\libzip\lib" *.c
dlltool --output-def functy.def functy.o
dlltool --dllname functy.exe --def functy.def --output-exp functy.exp
gcc -DUSE_GLADE -g -O2 -mwindows *.o functy.exp -L"%GTK_BASEPATH%\lib" -Wl,-luuid -lgtkglext-win32-1.0 -lgdkglext-win32-1.0 -lglu32 -lGLee -luser32 -lkernel32 -lopengl32 -lgtk-win32-2.0 -lglib-2.0 -lgdk-win32-2.0 -lgdk_pixbuf-2.0 -limm32 -lshell32 -lole32 -latk-1.0 -lpangocairo-1.0 -lcairo -lpangoft2-1.0 -lpangowin32-1.0 -lgdi32 -lz -lpango-1.0 -lgobject-2.0 -lm -lgmodule-2.0 -L"..\..\freeglut\lib" -lfreeglut -L"..\..\GLee" -L"..\..\libzip\lib" -lzip -lintl -L"..\..\Symbolic" -lsymbolic -o ..\functy.exe
gcc -DUSE_GLADE -g -O2 -mwindows *.o functy.exp -L"%GTK_BASEPATH%\lib" -Wl,-luuid -lgtkglext-win32-1.0 -lgdkglext-win32-1.0 -lglu32 -lGLee -luser32 -lkernel32 -lopengl32 -lgtk-win32-2.0 -lglib-2.0 -lgdk-win32-2.0 -lgdk_pixbuf-2.0 -limm32 -lshell32 -lole32 -latk-1.0 -lpangocairo-1.0 -lcairo -lpangoft2-1.0 -lpangowin32-1.0 -lgdi32 -lz -lpango-1.0 -lgobject-2.0 -lm -lgmodule-2.0 -lgio-2.0 -L"..\..\freeglut\lib" -lfreeglut -L"..\..\GLee" -L"..\..\libzip\lib" -lzip -lintl -llibpng -L"..\..\Symbolic" -lsymbolic -o ..\functy.exe
cd ..
:End
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment