Mahtan/wagic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed windows package and but in SDL frontend

Browse Source
This commit is contained in:
xawotihs
2016-06-25 11:50:07 +02:00
parent 10d9d84f84
commit 1f87ed77e4
2 changed files with 16 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
projects/mtg/bin/createWindowsZip.py
+4 -5
View File
@@ -7,11 +7,10 @@ from optparse import OptionParser
def createWindowsZipFile(filename, buildpath): def createWindowsZipFile(filename, buildpath):
utilities = ZipUtilities() utilities = ZipUtilities()
zip_file = zipfile.ZipFile(filename, 'w', zipfile.ZIP_STORED) zip_file = zipfile.ZipFile(filename, 'w', zipfile.ZIP_STORED)
zip_file.write('../../../LICENSE') zip_file.write(buildpath + '/../LICENSE')
zip_file.write('libpng13.dll') zip_file.write(buildpath + '/lib/Release/SDL2.dll', 'SDL2.dll')
zip_file.write(buildpath + '/lib/Release/SDL2.dll') zip_file.write(buildpath + '/lib/Release/zlib.dll', 'zlib.dll')
zip_file.write(buildpath + '/lib/Release/zlib.dll') zip_file.write(buildpath + '/bin/Release/wagic.exe', 'wagic.exe')
zip_file.write(buildpath + '/bin/Release/Wagic.exe')
zip_file.write('Res/' + getFilename('core') + '.zip') zip_file.write('Res/' + getFilename('core') + '.zip')
zip_file.close() zip_file.close()
projects/mtg/src/SDLmain.cpp
+12 -23
View File
@@ -226,11 +226,11 @@ public:
/* On Android, this is triggered when the device orientation changed */ /* On Android, this is triggered when the device orientation changed */
case SDL_WINDOWEVENT: case SDL_WINDOWEVENT:
window = SDL_GetWindowFromID(Event->window.windowID); window = SDL_GetWindowFromID(Event->window.windowID);
int h,w; int h, w;
SDL_GetWindowSize(window, &w, &h); SDL_GetWindowSize(window, &w, &h);
OnResize(w, h); OnResize(w, h);
break; break;
case SDL_KEYDOWN: case SDL_KEYDOWN:
case SDL_KEYUP: case SDL_KEYUP:
@@ -670,8 +670,8 @@ bool SdlApp::OnInit()
window_w = currentDisplayMode.w; window_w = currentDisplayMode.w;
window_h = currentDisplayMode.h; window_h = currentDisplayMode.h;
#else #else
window_w = ACTUAL_SCREEN_WIDTH; window_w = SCREEN_WIDTH;
window_h = ACTUAL_SCREEN_HEIGHT; window_h = SCREEN_HEIGHT;
#endif #endif
int buffers, samples; int buffers, samples;
@@ -720,9 +720,9 @@ bool SdlApp::OnInit()
#endif #endif
window = SDL_CreateWindow( window = SDL_CreateWindow(
g_launcher->GetName(), g_launcher->GetName(),
SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_CENTERED,
SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_CENTERED,
window_w, windowed_h, flags); window_w, window_h, flags);
if (window == NULL) if (window == NULL)
{ {
DebugTrace(SDL_GetError()); DebugTrace(SDL_GetError());
@@ -731,9 +731,7 @@ bool SdlApp::OnInit()
gl_context = SDL_GL_CreateContext(window); gl_context = SDL_GL_CreateContext(window);
glClearColor(0.0f, 0.0f, 0.0f, 0.0f); // Black Background (yes that's the way fuckers)
glClearColor(0.0f, 0.0f, 0.0f, 0.0f); // Black Background (yes that's the way fuckers)
#if (defined GL_ES_VERSION_2_0) || (defined GL_VERSION_2_0) #if (defined GL_ES_VERSION_2_0) || (defined GL_VERSION_2_0)
#if (defined GL_ES_VERSION_2_0) && (!defined __EMSCRIPTEN__) #if (defined GL_ES_VERSION_2_0) && (!defined __EMSCRIPTEN__)
@@ -799,16 +797,7 @@ int main(int argc, char* argv[])
#endif #endif
DebugTrace("I R in da native"); DebugTrace("I R in da native");
/*
DownloadRequest* downloadRequest = NULL;
Downloader*downloader = Downloader::GetInstance();
downloadRequest = downloader->Get(
"core.zip",
"file:///C:/Users/xawot_000/Documents/GitHub/wagic-master/build-emscripten/bin/Wagic-core.zip"
// "http://127.0.0.1:8000/Wagic-core.zip"
);
downloadRequest->waitUntilCompleted();
*/
g_launcher = new JGameLauncher(); g_launcher = new JGameLauncher();
u32 flags = g_launcher->GetInitFlags(); u32 flags = g_launcher->GetInitFlags();