Browse Source

publish private projects

Kolja Strohm 6 years ago
parent
commit
6ef7c2de89
5 changed files with 29 additions and 20 deletions
  1. 0 5
      GSL/Einstieg.cpp
  2. 0 4
      GSL/GSLDatei.h
  3. 0 4
      GSL/Sound.cpp
  4. 2 5
      GSL/Sound.h
  5. 27 2
      build.bat

+ 0 - 5
GSL/Einstieg.cpp

@@ -1,10 +1,5 @@
-#ifdef WIN32
 #include "Player.h"
 #include "Include/GSLDateiV.h"
-#else
-#include "Player.h"
-#include "GSLDateiV.h"
-#endif
 
 using namespace GSL;
 

+ 0 - 4
GSL/GSLDatei.h

@@ -5,11 +5,7 @@
 #include <Array.h>
 #include <Datei.h>
 #include <Critical.h>
-#ifdef WIN32
 #include "Include/GSLDateiV.h"
-#else
-#include "GSLDateiV.h"
-#endif
 
 using namespace Framework;
 

+ 0 - 4
GSL/Sound.cpp

@@ -1,9 +1,5 @@
 #include "Sound.h"
-#ifdef WIN32
-#include "Player.h"
-#else
 #include "Player.h"
-#endif
 
 using namespace GSL;
 

+ 2 - 5
GSL/Sound.h

@@ -1,14 +1,11 @@
 #ifndef Sound_H
 #define Sound_H
 
-#ifdef WIN32
-#include "GSLDatei.h"
 #include "Include/GSLSoundV.h"
+#ifdef WIN32
 #include <mmsystem.h>
-#else
-#include "GSLDatei.h"
-#include "GSLSoundV.h"
 #endif
+#include "GSLDatei.h"
 #include <Critical.h>
 
 using namespace Framework;

+ 27 - 2
build.bat

@@ -1,6 +1,31 @@
+:DebugWin64
+SET RETURN=DebugWin64
+SET NEXT=ReleaseWin64
 "D:\Visual Studio 2017\MSBuild\15.0\Bin\MSBuild.exe" "GSL/GSL.vcxproj" /p:configuration=debug /p:platform=x64
+if errorlevel 1 GOTO Error
+:ReleaseWin64
+SET RETURN=ReleaseWin64
+SET NEXT=ReleaseWin32
 "D:\Visual Studio 2017\MSBuild\15.0\Bin\MSBuild.exe" "GSL/GSL.vcxproj" /p:configuration=release /p:platform=x64
+if errorlevel 1 GOTO Error
+:ReleaseWin32
+SET RETURN=ReleaseWin32
+SET NEXT=DebugLinux64
 "D:\Visual Studio 2017\MSBuild\15.0\Bin\MSBuild.exe" "GSL/GSL.vcxproj" /p:configuration=release /p:platform=win32
-
+if errorlevel 1 GOTO Error
+:DebugLinux64
+SET RETURN=DebugLinux64
+SET NEXT=ReleaseLinux64
 "D:\Visual Studio 2017\MSBuild\15.0\Bin\MSBuild.exe" "GSL Linux/GSL Linux.vcxproj" /t:rebuild /p:configuration=debug /p:platform=x64
-"D:\Visual Studio 2017\MSBuild\15.0\Bin\MSBuild.exe" "GSL Linux/GSL Linux.vcxproj" /t:rebuild /p:configuration=release /p:platform=x64
+if errorlevel 1 GOTO Error
+:ReleaseLinux64
+SET RETURN=ReleaseLinux64
+SET NEXT=End
+"D:\Visual Studio 2017\MSBuild\15.0\Bin\MSBuild.exe" "GSL Linux/GSL Linux.vcxproj" /t:rebuild /p:configuration=release /p:platform=x64
+if errorlevel 1 GOTO Error
+GOTO End
+:Error
+SET /p redo=Nochmal versuchen?(j/n):
+IF /I '%redo%' equ 'j' GOTO %RETURN%
+GOTO %NEXT%
+:End